From: Morgan Smith <Morgan.J.Smith@outlook.com> * gnu/packages/emacs-xyz.scm (emacs-geiser-guile): New variable. --- gnu/packages/emacs-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1756f0cdec..4d271c16cd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -257,6 +257,44 @@ (define-public emacs-geiser schemer, giving them access to live metadata.") (license license:bsd-3))) +(define-public emacs-geiser-guile + (package + (name "emacs-geiser-guile") + (version "0.13") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/emacs-geiser/guile.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0w264pjwlxna31260ll6gd0n77jlynhzf3h2dws5wr7jflns5mbc")))) + (build-system emacs-build-system) + (arguments + '(#:include (cons "^src/" %default-include) + #:phases + (modify-phases %standard-phases + (add-after 'move-elisp-files 'set-src-path + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (file "geiser-guile.el")) + (make-file-writable file) + (emacs-substitute-variables file + ("geiser-guile-scheme-dir" + (string-append out "/share/emacs/site-lisp/src/geiser"))) + #t)))))) + (inputs + `(("guile" ,guile-2.2))) + (propagated-inputs + `(("geiser" ,emacs-geiser))) + (home-page "https://nongnu.org/geiser/") + (synopsis "Guile Scheme support for Geiser") + (description + "This package adds support for the Guile Scheme implementation to Geiser, +a generic Scheme interaction mode for the GNU Emacs editor.") + (license license:bsd-3))) + (define-public emacs-ac-geiser (let ((commit "93818c936ee7e2f1ba1b315578bde363a7d43d05") (revision "0")) -- 2.31.1
From: Morgan Smith <Morgan.J.Smith@outlook.com> * gnu/packages/emacs-xyz.scm (emacs-guix): Update to 0.5.2-4.8ce6d21 [source]: Update upstream URL [propagated-inputs]: Add emacs-geiser-guile --- gnu/packages/emacs-xyz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4d271c16cd..8c6d4c24bc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3032,8 +3032,8 @@ (define-public emacs-bui (license license:gpl3+))) (define-public emacs-guix - (let* ((commit "a694fdbcedb6edd2239a31d326e475c763ee32f8") - (revision "3")) + (let ((commit "8ce6d219e87c5097abff9ce6f1f5a4293cdfcb31") + (revision "4")) (package (name "emacs-guix") (version (git-version "0.5.2" revision commit)) @@ -3041,12 +3041,12 @@ (define-public emacs-guix (method git-fetch) (uri (git-reference ;; TODO: Use the official version when it has a new home - (url "https://github.com/jsoo1/guix.el") + (url "https://github.com/alezost/guix.el") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "1pqw7zbgxzwpig4xr0izc3z8h80c72i6bl5yi12br0d7aq6dbkvj")))) + "0awbd8x154c4dk4av7inpgd63n07xzng84vvc8qckmgljknc0j7k")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -3060,6 +3060,7 @@ (define-public emacs-guix ("guix" ,guix))) (propagated-inputs `(("geiser" ,emacs-geiser) + ("geiser-guile" ,emacs-geiser-guile) ("guile-gcrypt" ,guile-gcrypt) ("dash" ,emacs-dash) ("bui" ,emacs-bui) -- 2.31.1
From: Morgan Smith <Morgan.J.Smith@outlook.com> * gnu/packages/emacs-xyz.scm (emacs-flycheck-guile)[propagated-inputs]: Add emacs-geiser-guile --- gnu/packages/emacs-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8c6d4c24bc..7ae58b7644 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5020,7 +5020,8 @@ (define-public emacs-flycheck-guile (base32 "0cs5r0ik6a3bl1k3imjl0r8y1i69kx9x9m9cgxj470qk34brwyj5")))) (propagated-inputs `(("emacs-flycheck" ,emacs-flycheck) - ("emacs-geiser" ,emacs-geiser))) + ("emacs-geiser" ,emacs-geiser) + ("emacs-geiser-guile" ,emacs-geiser-guile))) (build-system emacs-build-system) (home-page "https://github.com/flatwhatson/flycheck-guile") (synopsis "GNU Guile support for Flycheck") -- 2.31.1
From: Morgan Smith <Morgan.J.Smith@outlook.com> * gnu/packages/guile-xyz.scm (guile-studio)[inputs]: Add emacs-geiser-guile --- gnu/packages/guile-xyz.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e2ee5454a0..9bfb19c333 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2750,6 +2750,7 @@ (define-public guile-studio ("emacs-doom-modeline" ,emacs-doom-modeline) ("emacs-modus-themes" ,emacs-modus-themes) ("emacs-geiser" ,emacs-geiser) + ("emacs-geiser-guile" ,emacs-geiser-guile) ("emacs-company" ,emacs-company) ("emacs-ivy" ,emacs-ivy) ("emacs-flycheck" ,emacs-flycheck) -- 2.31.1
Hi Morgan, just a heads up, that this patch, which you've submitted for review, will break with upcoming changes in emacs-build-system. Check out the wip-emacs branch for more information. Am Dienstag, den 06.04.2021, 17:33 -0400 schrieb Morgan.J.Smith@outlook.com: > From: Morgan Smith <Morgan.J.Smith@outlook.com> > > * gnu/packages/emacs-xyz.scm (emacs-geiser-guile): New variable. > --- > gnu/packages/emacs-xyz.scm | 38 > ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index 1756f0cdec..4d271c16cd 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -257,6 +257,44 @@ (define-public emacs-geiser > schemer, giving them access to live metadata.") > (license license:bsd-3))) > > +(define-public emacs-geiser-guile > + (package > + (name "emacs-geiser-guile") > + (version "0.13") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://gitlab.com/emacs-geiser/guile.git") > + (commit version))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > "0w264pjwlxna31260ll6gd0n77jlynhzf3h2dws5wr7jflns5mbc")))) > + (build-system emacs-build-system) > + (arguments > + '(#:include (cons "^src/" %default-include) > + #:phases > + (modify-phases %standard-phases > + (add-after 'move-elisp-files 'set-src-path > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((out (assoc-ref outputs "out")) > + (file "geiser-guile.el")) > + (make-file-writable file) > + (emacs-substitute-variables file > + ("geiser-guile-scheme-dir" > + (string-append out "/share/emacs/site- > lisp/src/geiser"))) > + #t)))))) The site-lisp/src path is no longer valid, it should instead be site-lisp/guile-geiser-<guile-geiser-version>/src. > + (inputs > + `(("guile" ,guile-2.2))) > + (propagated-inputs > + `(("geiser" ,emacs-geiser))) > + (home-page "https://nongnu.org/geiser/") > + (synopsis "Guile Scheme support for Geiser") > + (description > + "This package adds support for the Guile Scheme implementation > to Geiser, > +a generic Scheme interaction mode for the GNU Emacs editor.") > + (license license:bsd-3))) > + > (define-public emacs-ac-geiser > (let ((commit "93818c936ee7e2f1ba1b315578bde363a7d43d05") > (revision "0")) Regards, Leo
Hi again,
after the debugging we did together in IRC, some short exchange with
jaor and a bit of hacking, I pushed a working variant to wip-emacs.
I'm therefore going to mark this as done.
Am Mittwoch, den 07.04.2021, 12:24 +0200 schrieb Leo Prikler:
> Hi Morgan,
>
> just a heads up, that this patch, which you've submitted for review,
> will break with upcoming changes in emacs-build-system. Check out
> the
> wip-emacs branch for more information.
>
> Am Dienstag, den 06.04.2021, 17:33 -0400 schrieb
> Morgan.J.Smith@outlook.com:
> > From: Morgan Smith <Morgan.J.Smith@outlook.com>
> >
> > * gnu/packages/emacs-xyz.scm (emacs-geiser-guile): New variable.
> > ---
> > gnu/packages/emacs-xyz.scm | 38
> > ++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 38 insertions(+)
> >
> > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-
> > xyz.scm
> > index 1756f0cdec..4d271c16cd 100644
> > --- a/gnu/packages/emacs-xyz.scm
> > +++ b/gnu/packages/emacs-xyz.scm
> > @@ -257,6 +257,44 @@ (define-public emacs-geiser
> > schemer, giving them access to live metadata.")
> > (license license:bsd-3)))
> >
> > +(define-public emacs-geiser-guile
> > + (package
> > + (name "emacs-geiser-guile")
> > + (version "0.13")
> > + (source
> > + (origin
> > + (method git-fetch)
> > + (uri (git-reference
> > + (url "https://gitlab.com/emacs-geiser/guile.git")
> > + (commit version)))
> > + (file-name (git-file-name name version))
> > + (sha256
> > + (base32
> > "0w264pjwlxna31260ll6gd0n77jlynhzf3h2dws5wr7jflns5mbc"))))
> > + (build-system emacs-build-system)
> > + (arguments
> > + '(#:include (cons "^src/" %default-include)
> > + #:phases
> > + (modify-phases %standard-phases
> > + (add-after 'move-elisp-files 'set-src-path
> > + (lambda* (#:key outputs #:allow-other-keys)
> > + (let ((out (assoc-ref outputs "out"))
> > + (file "geiser-guile.el"))
> > + (make-file-writable file)
> > + (emacs-substitute-variables file
> > + ("geiser-guile-scheme-dir"
> > + (string-append out "/share/emacs/site-
> > lisp/src/geiser")))
> > + #t))))))
> The site-lisp/src path is no longer valid, it should instead be
> site-lisp/guile-geiser-<guile-geiser-version>/src.
> > + (inputs
> > + `(("guile" ,guile-2.2)))
> > + (propagated-inputs
> > + `(("geiser" ,emacs-geiser)))
> > + (home-page "https://nongnu.org/geiser/")
> > + (synopsis "Guile Scheme support for Geiser")
> > + (description
> > + "This package adds support for the Guile Scheme
> > implementation
> > to Geiser,
> > +a generic Scheme interaction mode for the GNU Emacs editor.")
> > + (license license:bsd-3)))
> > +
> > (define-public emacs-ac-geiser
> > (let ((commit "93818c936ee7e2f1ba1b315578bde363a7d43d05")
> > (revision "0"))
>
> Regards,
> Leo