From 9ca8aa38ecce0b0651a0ff394ee4ce32bdd0bb41 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 28 Jul 2017 17:52:21 +0200 Subject: gnu: guix: Add dependency on Guile-Git. * gnu/packages/package-management.scm (guix)[arguments] : Add Guile-Git to PATH. [propagated-inputs]: Add GUILE-GIT. (guile2.0-guix)[propagated-inputs]: Add GUILE2.0-GIT. --- gnu/packages/package-management.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index d49b4c3a4f..3650b5d957 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -187,6 +187,7 @@ (let* ((out (assoc-ref outputs "out")) (guile (assoc-ref inputs "guile")) (json (assoc-ref inputs "guile-json")) + (git (assoc-ref inputs "guile-git")) (ssh (assoc-ref inputs "guile-ssh")) (gnutls (assoc-ref inputs "gnutls")) (effective @@ -196,6 +197,7 @@ "-c" "(display (effective-version))"))) (path (string-append json "/share/guile/site/" effective ":" + git "/share/guile/site/" effective ":" ssh "/share/guile/site/" effective ":" gnutls "/share/guile/site/" effective))) @@ -252,7 +254,8 @@ (propagated-inputs `(("gnutls" ,gnutls/guile-2.2) ;for 'guix download' & co. ("guile-json" ,guile-json) - ("guile-ssh" ,guile-ssh))) + ("guile-ssh" ,guile-ssh) + ("guile-git" ,guile-git))) (home-page "https://www.gnu.org/software/guix/") (synopsis "Functional package manager for installed software packages and versions") @@ -278,7 +281,8 @@ the Nix package manager.") (propagated-inputs `(("gnutls" ,gnutls) ("guile-json" ,guile2.0-json) - ("guile-ssh" ,guile2.0-ssh))))) + ("guile-ssh" ,guile2.0-ssh) + ("guile-git" ,guile2.0-git))))) (define (source-file? file stat) "Return true if FILE is likely a source file, false if it is a typical -- cgit v1.2.3 From 1c0ee79d4dc74f1001644dbb610075dc95dcf102 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 30 Jul 2017 17:58:04 +0200 Subject: gnu: guix: Update snapshot. * gnu/packages/package-management.scm (guix): Update to 228a398. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3650b5d957..835c0b291b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -76,8 +76,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "0.13.0") - (commit "f1ddfe4f14b8a8d963f2f3e68d800b745696246d") - (revision 4)) + (commit "228a3982df157847554abc9d0831d687264d8ebd") + (revision 5)) (package (name "guix") @@ -93,7 +93,7 @@ (commit commit))) (sha256 (base32 - "11yjsn957igh6migxrnicdqrxc76skz5r0l7hfnm5gp45my1kd9p")) + "1gnc1w9kby7db9jih4xwrhrv0j57zy09lmr85gbmcqna6bx3wypw")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From c91171627b5e8351c1b0251cc64ddfea2d952869 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 30 Jul 2017 21:36:18 +0200 Subject: gnu: guix: Search .go files of dependencies in lib/guile/. * gnu/packages/package-management.scm (guix)[arguments]: Add (srfi srfi-26) to #:modules. Introduce 'gopath', distinct from 'path'. --- gnu/packages/package-management.scm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 835c0b291b..5c0e5a9c7d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -121,6 +121,7 @@ #:modules ((guix build gnu-build-system) (guix build utils) + (srfi srfi-26) (ice-9 popen) (ice-9 rdelim)) @@ -190,20 +191,28 @@ (git (assoc-ref inputs "guile-git")) (ssh (assoc-ref inputs "guile-ssh")) (gnutls (assoc-ref inputs "gnutls")) + (deps (list json gnutls git ssh)) (effective (read-line (open-pipe* OPEN_READ (string-append guile "/bin/guile") "-c" "(display (effective-version))"))) - (path (string-append - json "/share/guile/site/" effective ":" - git "/share/guile/site/" effective ":" - ssh "/share/guile/site/" effective ":" - gnutls "/share/guile/site/" effective))) + (path (string-join + (map (cut string-append <> + "/share/guile/site/" + effective) + deps) + ":")) + (gopath (string-join + (map (cut string-append <> + "/lib/guile/" effective + "/site-ccache") + deps) + ":"))) (wrap-program (string-append out "/bin/guix") `("GUILE_LOAD_PATH" ":" prefix (,path)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,path))) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath))) #t)))))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3