1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-27 19:41:50 +02:00

gnu: nix: Update to 2.23.4.

* gnu/packages/package-management.scm (nix): Update to 2.23.4.
[arguments]{phases}: Adapt phase 'skip-failing-tests.

Change-Id: Ifcf86a9b328a4fce60f752730f19eb55f9d0abb8
This commit is contained in:
Nicolas Graves
2025-07-03 00:53:29 +02:00
committed by Andreas Enge
parent 9ea0d12c88
commit 7a2be11c8b
+2 -7
View File
@@ -857,7 +857,7 @@ by using a Xapian cache.")
(define-public nix (define-public nix
(package (package
(name "nix") (name "nix")
(version "2.22.4") (version "2.23.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@@ -866,7 +866,7 @@ by using a Xapian cache.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "06mq99ky3l3cfgghxhmw4kh1cx04abcdj3y8k24fq29yq36cjs15")) (base32 "0lbj7dcg7wqgc8yclmgflsv2wlkc53h55dzwalfp2w126phhgs5f"))
(patches (patches
(search-patches "nix-dont-build-html-doc.diff")))) (search-patches "nix-dont-build-html-doc.diff"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@@ -905,11 +905,6 @@ by using a Xapian cache.")
(setenv "NIX_STORE" original-NIX_STORE)))))) (setenv "NIX_STORE" original-NIX_STORE))))))
(add-after 'unpack 'skip-failing-tests (add-after 'unpack 'skip-failing-tests
(lambda _ (lambda _
;; XXX: ${shell} is sometimes used in tests, but
;; this doesn't seem to help much.
(substitute* "tests/functional/common/vars-and-functions.sh.in"
(("export SHELL=\"@bash@\"" all)
(string-append all "\nexport shell=\"@bash@\"")))
(substitute* "Makefile" (substitute* "Makefile"
(("tests/functional/git-hashing/local.mk") (("tests/functional/git-hashing/local.mk")
"")) ""))