From 6fd7f161d7cd6248e99e9ba44424b162d443cd61 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 29 Apr 2021 17:38:02 -0400 Subject: gnu: guix: Update to 1.3.0rc1. --- gnu/packages/package-management.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 08050e9747..284982b7a3 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -131,9 +131,9 @@ ;; Latest version of Guix, which may or may not correspond to a release. ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. - (let ((version "1.2.0") - (commit "4dff6ecde85eec473ab231cf75f51e98e8aca1e9") - (revision 21)) + (let ((version "1.3.0rc1") + (commit "0d353b06ec6571972d2e8a3e3a3f0b27aa950e1c") + (revision 0)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1n16j7rb4n4pjmp8ck5g206rphmzxii2mbyz1nk4qk70zc3mwszq")) + "0zqdi8nsyarj6jlbx2i6q3fns9chi04yfazlkfkm1fwqd7jlvg35")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 9bf205e5a07d9cc6e225f25e60482db7d446afcc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 29 Apr 2021 21:18:56 -0400 Subject: gnu: guix: Update to 6fd7f16. --- 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 284982b7a3..b3f4b44dd3 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.3.0rc1") - (commit "0d353b06ec6571972d2e8a3e3a3f0b27aa950e1c") - (revision 0)) + (commit "6fd7f161d7cd6248e99e9ba44424b162d443cd61") + (revision 1)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "0zqdi8nsyarj6jlbx2i6q3fns9chi04yfazlkfkm1fwqd7jlvg35")) + "0b92w6lqp4h75dds3fbxdp5shvfpkcdin809f8v94l4a2fbxkais")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 72b7ea416b2c3aef31434f026238c97bd97b6bc8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 May 2021 14:04:39 +0200 Subject: gnu: guix: Add run-time dependency on Guile-Lib. This is a followup to 02e2e093e858e8a0ca7bd66c1f1f6fd0a1705edb, which added Guile-Lib as an input but did not add it to the wrapper's search path. * gnu/packages/package-management.scm (guix)[arguments]: In 'wrap-program' phase, add GUILE-LIB to DEPS. --- gnu/packages/package-management.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b3f4b44dd3..0add8f4220 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -317,7 +317,7 @@ $(prefix)/etc/openrc\n"))) (gnutls (assoc-ref inputs "gnutls")) (locales (assoc-ref inputs "glibc-utf8-locales")) (deps (list gcrypt json sqlite gnutls git - bs ssh zlib lzlib zstd)) + bs ssh zlib lzlib zstd guile-lib)) (deps* ,@(if (%current-target-system) '(deps) '((cons avahi deps)))) -- cgit v1.2.3 From c47f3fc13562d82edfd2d47342574154c452843a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 May 2021 14:35:31 +0200 Subject: gnu: guix: Avoid Bash wrapper. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Bash wrapper created by 'wrap-program' creates an extra indirection and may annoyingly emit locale warnings: /gnu/store/…-bash-minimal-5.0.16/bin/bash: warning: setlocale: LC_ALL: cannot change locale (wtf) This warning would typically show up when running Guix, as produced by 'guix pack guix', on a foreign distro, annihilating efforts made in 1d4ab335b22a93e01c2eb1eb3e93fc6534157040 and 8a973abc6f7eebfcd8a904bfbb99cb9f86f66ef0. * gnu/packages/package-management.scm (guix)[arguments]: In 'wrap-program' phase, remove 'string-join' call for PATH and GOPATH. Replace 'wrap-program' call with a 'substitute*' form. Remove (when target ...) form. [inputs]: Remove "bash-minimal" added in commit 38b9af7c92344a17b6680ebd2aeea14171f84a1c and no longer needed. --- gnu/packages/package-management.scm | 56 ++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 25 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 0add8f4220..56b436c6f8 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -326,31 +326,38 @@ $(prefix)/etc/openrc\n"))) (open-pipe* OPEN_READ (string-append guile "/bin/guile") "-c" "(display (effective-version))"))) - (path (string-join - (map (cut string-append <> - "/share/guile/site/" - effective) - (delete #f deps*)) - ":")) - (gopath (string-join - (map (cut string-append <> - "/lib/guile/" effective - "/site-ccache") - (delete #f deps*)) - ":")) + (path (map (cut string-append <> + "/share/guile/site/" + effective) + (delete #f deps*))) + (gopath (map (cut string-append <> + "/lib/guile/" effective + "/site-ccache") + (delete #f deps*))) (locpath (string-append locales "/lib/locale"))) - (wrap-program (string-append out "/bin/guix") - `("GUILE_LOAD_PATH" ":" prefix (,path)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,gopath)) - `("GUIX_LOCPATH" ":" suffix (,locpath))) - - (when target - ;; XXX Touching wrap-program rebuilds world - (let ((bash (assoc-ref inputs "bash"))) - (substitute* (string-append out "/bin/guix") - (("^#!.*/bash") (string-append "#! " bash "/bin/bash"))))) - #t))) + ;; Modify 'guix' directly instead of using + ;; 'wrap-program'. This avoids the indirection + ;; through Bash, which in turn avoids getting Bash's + ;; own locale warnings. + (substitute* (string-append out "/bin/guix") + (("!#") + (string-append + "!#\n\n" + (object->string + `(set! %load-path (append ',path %load-path))) + "\n" + (object->string + `(set! %load-compiled-path + (append ',gopath %load-compiled-path))) + "\n" + (object->string + `(let ((path (getenv "GUIX_LOCPATH"))) + (setenv "GUIX_LOCPATH" + (if path + (string-append path ":" ,locpath) + ,locpath)))) + "\n\n")))))) ;; The 'guix' executable has 'OUT/libexec/guix/guile' as ;; its shebang; that should remain unchanged, thus remove @@ -405,8 +412,7 @@ $(prefix)/etc/openrc\n"))) `(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux"))) '()) ,@(if (%current-target-system) - `(("bash" ,bash-minimal) - ("xz" ,xz)) + `(("xz" ,xz)) '()) ;; Tests also rely on these bootstrap executables. -- cgit v1.2.3 From af66a9510fdbe9a7cb3ad2a1acdf190553727704 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 4 May 2021 15:17:45 +0200 Subject: gnu: guix: Phases refer to #:system, #:target, and #:native-inputs. * gnu/packages/package-management.scm (guix)[arguments]: In 'copy-bootstrap-guile' and 'wrap-program' phases, refer to #:system, #:native-inputs, and #:target instead of unquoting (%current-system) and (%current-target-system). --- gnu/packages/package-management.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 56b436c6f8..3f72d4fac9 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -261,11 +261,9 @@ $(prefix)/etc/openrc\n"))) (intern (assoc-ref inputs "boot-guile") #f) ;; On x86_64 some tests need the i686 Guile. - ,@(if (and (not (%current-target-system)) - (string=? (%current-system) - "x86_64-linux")) - '((intern (assoc-ref inputs "boot-guile/i686") #f)) - '()) + (when (and (not target) + (string=? system "x86_64-linux")) + (intern (assoc-ref inputs "boot-guile/i686") #f)) ;; Copy the bootstrap executables. (for-each (lambda (input) @@ -299,9 +297,8 @@ $(prefix)/etc/openrc\n"))) ;; Make sure the 'guix' command finds GnuTLS, ;; Guile-JSON, and Guile-Git automatically. (let* ((out (assoc-ref outputs "out")) - (guile ,@(if (%current-target-system) - '((assoc-ref native-inputs "guile")) - '((assoc-ref inputs "guile")))) + (guile (assoc-ref (or native-inputs inputs) + "guile")) (avahi (assoc-ref inputs "guile-avahi")) (gcrypt (assoc-ref inputs "guile-gcrypt")) (guile-lib (assoc-ref inputs "guile-lib")) @@ -318,9 +315,7 @@ $(prefix)/etc/openrc\n"))) (locales (assoc-ref inputs "glibc-utf8-locales")) (deps (list gcrypt json sqlite gnutls git bs ssh zlib lzlib zstd guile-lib)) - (deps* ,@(if (%current-target-system) - '(deps) - '((cons avahi deps)))) + (deps* (if avahi (cons avahi deps) deps)) (effective (read-line (open-pipe* OPEN_READ -- cgit v1.2.3 From 76c4646beb878e19a4cf1ca5789b699e597f27b0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 5 May 2021 00:52:27 +0200 Subject: gnu: guile2.2-guix: Add missing dependencies. Reported by Maxime Devos . * gnu/packages/package-management.scm (guile2.2-guix)[inputs] [propagated-inputs]: Add GUILE2.2-LIB, GUILE2.2-ZLIB, and GUILE2.2-LZLIB. --- gnu/packages/package-management.scm | 11 +++++++++-- 1 file changed, 9 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 3f72d4fac9..9e9edcf70d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -524,12 +524,16 @@ the Nix package manager.") ("gnutls" ,guile2.2-gnutls) ("guile-gcrypt" ,guile2.2-gcrypt) ("guile-json" ,guile2.2-json) + ("guile-lib" ,guile2.2-lib) ("guile-sqlite3" ,guile2.2-sqlite3) ("guile-ssh" ,guile2.2-ssh) ("guile-git" ,guile2.2-git) + ("guile-zlib" ,guile2.2-zlib) + ("guile-lzlib" ,guile2.2-lzlib) ,@(fold alist-delete (package-native-inputs guix) '("guile" "gnutls" "guile-gcrypt" "guile-json" - "guile-sqlite3" "guile-ssh" "guile-git")))) + "guile-lib" "guile-sqlite3" "guile-ssh" "guile-git" + "guile-zlib" "guile-lzlib")))) (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guix)))) @@ -537,9 +541,12 @@ the Nix package manager.") `(("gnutls" ,gnutls) ("guile-gcrypt" ,guile2.2-gcrypt) ("guile-json" ,guile2.2-json) + ("guile-lib" ,guile2.2-lib) ("guile-sqlite3" ,guile2.2-sqlite3) ("guile-ssh" ,guile2.2-ssh) - ("guile-git" ,guile2.2-git))))) + ("guile-git" ,guile2.2-git) + ("guile-zlib" ,guile2.2-zlib) + ("guile-lzlib" ,guile2.2-lzlib))))) (define-public guile3.0-guix (deprecated-package "guile3.0-guix" guix)) -- cgit v1.2.3 From 566982bc7133173ed863b543fa2fd38d8fab9af7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 8 May 2021 00:29:22 -0400 Subject: gnu: guix: Update to 1.3.0rc2. --- gnu/packages/package-management.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9e9edcf70d..f7b0215050 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -131,9 +131,9 @@ ;; Latest version of Guix, which may or may not correspond to a release. ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. - (let ((version "1.3.0rc1") - (commit "6fd7f161d7cd6248e99e9ba44424b162d443cd61") - (revision 1)) + (let ((version "1.3.0rc2") + (commit "7a65beff0f3c3958ae38087bb7b565e981e99ac1") + (revision 0)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "0b92w6lqp4h75dds3fbxdp5shvfpkcdin809f8v94l4a2fbxkais")) + "18gi8v2xni8q8xrcmcbzqs6q2gkghvbi9456ly8q0isv14b11g6s")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From dde029147619cdee9956dfa053933f9a4e619b5d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 8 May 2021 00:33:14 -0400 Subject: gnu: guix: Update to 566982b. --- 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 f7b0215050..9ad4f0901d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.3.0rc2") - (commit "7a65beff0f3c3958ae38087bb7b565e981e99ac1") - (revision 0)) + (commit "566982bc7133173ed863b543fa2fd38d8fab9af7") + (revision 1)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "18gi8v2xni8q8xrcmcbzqs6q2gkghvbi9456ly8q0isv14b11g6s")) + "0ys8sjckp1a9hmisvjwjr34w7bzi9pskgkwiiqhjm36fs0z8ks30")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 771b866c55e5f992df60f6c32f5fdd78b64e17f6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 May 2021 14:15:04 -0400 Subject: gnu: guix: Update to 1.3.0. --- gnu/packages/package-management.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/package-management.scm') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9ad4f0901d..ac6701f4f3 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -131,9 +131,9 @@ ;; Latest version of Guix, which may or may not correspond to a release. ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. - (let ((version "1.3.0rc2") - (commit "566982bc7133173ed863b543fa2fd38d8fab9af7") - (revision 1)) + (let ((version "1.3.0") + (commit "a0178d34f582b50e9bdbb0403943129ae5b560ff") + (revision 0)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "0ys8sjckp1a9hmisvjwjr34w7bzi9pskgkwiiqhjm36fs0z8ks30")) + "1b4kbcv55vvabyzrpwdbr29lif4m4f628lm3h9si4qiw5czjwswv")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From fb5d04d36334784a5ac76c4a90de1e1376120885 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 11 May 2021 16:27:17 -0400 Subject: gnu: guix: Update to 771b866. --- 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 ac6701f4f3..9991c584f0 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.3.0") - (commit "a0178d34f582b50e9bdbb0403943129ae5b560ff") - (revision 0)) + (commit "771b866c55e5f992df60f6c32f5fdd78b64e17f6") + (revision 1)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1b4kbcv55vvabyzrpwdbr29lif4m4f628lm3h9si4qiw5czjwswv")) + "0w8w05w6v3lc6478vfw67jzn0hbd9nsncpx9i9ch1lck53r8vs44")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit v1.2.3