gnu: emacs-guix: Update to 0.5.

* gnu/packages/emacs.scm (emacs-guix): Update to 0.5.
[propagated-inputs]: Add 'guile-gcrypt'.
[arguments]: Adjust #:configure-flags accordingly.
This commit is contained in:
Alex Kost 2018-09-10 18:33:03 +03:00
parent fdf68c232d
commit 8a8662d286
No known key found for this signature in database
GPG Key ID: 82460C082A0EE98F
1 changed files with 20 additions and 15 deletions

View File

@ -1659,38 +1659,42 @@ type, for example: packages, buffers, files, etc.")
(define-public emacs-guix (define-public emacs-guix
(package (package
(name "emacs-guix") (name "emacs-guix")
(version "0.4.1.1") (version "0.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://emacs-guix.gitlab.io/website/" (uri (string-append "https://emacs-guix.gitlab.io/website/"
"releases/emacs-guix-" version ".tar.gz")) "releases/emacs-guix-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0jbnrcazbks7h50rngpw5l40a6vn2794kb53cpva3yzdjmrc1955")))) "09zxd8x674vrpigmcx8l00ifhaxh35xwkwjb8dw9kydnhv9hyyi1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(let ((guix (assoc-ref %build-inputs "guix")) (let ((guix (assoc-ref %build-inputs "guix"))
(gcrypt (assoc-ref %build-inputs "guile-gcrypt"))
(geiser (assoc-ref %build-inputs "geiser")) (geiser (assoc-ref %build-inputs "geiser"))
(dash (assoc-ref %build-inputs "dash")) (dash (assoc-ref %build-inputs "dash"))
(bui (assoc-ref %build-inputs "bui")) (bui (assoc-ref %build-inputs "bui"))
(magit-popup (assoc-ref %build-inputs "magit-popup")) (magit-popup (assoc-ref %build-inputs "magit-popup"))
(edit-indirect (assoc-ref %build-inputs "edit-indirect")) (edit-indirect (assoc-ref %build-inputs "edit-indirect"))
(site-lisp "/share/emacs/site-lisp")) (site-lisp "/share/emacs/site-lisp")
(list (string-append "--with-guix-site-dir=" (site-scm "/share/guile/site")
(car (find-files (string-append guix (site-go "/lib/guile")
"/share/guile/site") (guile-dir (lambda (dir)
(lambda (file stat) (car (find-files dir
(string-prefix?
"2."
(basename file)))
#:directories? #t)))
(string-append "--with-guix-site-ccache-dir="
(car (find-files (string-append guix "/lib/guile")
(lambda (file stat) (lambda (file stat)
(string-prefix? (string-prefix?
"2." (basename file))) "2." (basename file)))
#:directories? #t)) #:directories? #t)))))
(list (string-append "--with-guix-site-dir="
(guile-dir (string-append guix site-scm)))
(string-append "--with-guix-site-ccache-dir="
(guile-dir (string-append guix site-go))
"/site-ccache")
(string-append "--with-guile-gcrypt-site-dir="
(guile-dir (string-append gcrypt site-scm)))
(string-append "--with-guile-gcrypt-site-ccache-dir="
(guile-dir (string-append gcrypt site-go))
"/site-ccache") "/site-ccache")
(string-append "--with-geiser-lispdir=" geiser site-lisp) (string-append "--with-geiser-lispdir=" geiser site-lisp)
(string-append "--with-dash-lispdir=" (string-append "--with-dash-lispdir="
@ -1713,6 +1717,7 @@ type, for example: packages, buffers, files, etc.")
("guix" ,guix))) ("guix" ,guix)))
(propagated-inputs (propagated-inputs
`(("geiser" ,geiser) `(("geiser" ,geiser)
("guile-gcrypt" ,guile-gcrypt)
("dash" ,emacs-dash) ("dash" ,emacs-dash)
("bui" ,emacs-bui) ("bui" ,emacs-bui)
("edit-indirect" ,emacs-edit-indirect) ("edit-indirect" ,emacs-edit-indirect)