Message ID | BYAPR05MB40237F19B96F06A7D828B8C5C5769@BYAPR05MB4023.namprd05.prod.outlook.com |
---|---|
State | Accepted |
Headers | show |
Series | None | expand |
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
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"))
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(+)