summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Graves <ngraves@ngraves.fr>2025-07-03 00:53:29 +0200
committerAndreas Enge <andreas@enge.fr>2025-07-22 12:53:46 +0200
commit7a2be11c8bc4bed5c32894399ace5a88bb73846c (patch)
tree9f4930e508c97578264d2c9ed3e87866e414a013
parent9ea0d12c880cdd333de968515db54569f0a8aea9 (diff)
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
-rw-r--r--gnu/packages/package-management.scm9
1 files changed, 2 insertions, 7 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index cf3d3c894a..6e78d0e849 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -857,7 +857,7 @@ by using a Xapian cache.")
(define-public nix
(package
(name "nix")
- (version "2.22.4")
+ (version "2.23.4")
(source
(origin
(method git-fetch)
@@ -866,7 +866,7 @@ by using a Xapian cache.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "06mq99ky3l3cfgghxhmw4kh1cx04abcdj3y8k24fq29yq36cjs15"))
+ (base32 "0lbj7dcg7wqgc8yclmgflsv2wlkc53h55dzwalfp2w126phhgs5f"))
(patches
(search-patches "nix-dont-build-html-doc.diff"))))
(build-system gnu-build-system)
@@ -905,11 +905,6 @@ by using a Xapian cache.")
(setenv "NIX_STORE" original-NIX_STORE))))))
(add-after 'unpack 'skip-failing-tests
(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"
(("tests/functional/git-hashing/local.mk")
""))