diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2025-07-02 19:26:51 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-22 12:53:59 +0200 |
| commit | 9a87de50b4fd2f5b622f43b058575f427d49c72d (patch) | |
| tree | ab6ce92e8587afabab4da4b3a0de3d1960e04af6 /gnu/packages/package-management.scm | |
| parent | 7a2be11c8bc4bed5c32894399ace5a88bb73846c (diff) | |
gnu: nix: Update to 2.24.15.
* gnu/packages/package-management.scm (nix): Update to 2.24.15.
[arguments]{phases}: Adapt phase 'skip-failing-tests.
* gnu/packages/patches/nix-dont-build-html-doc.diff: Update accordingly.
Change-Id: I920e6fcc2f8dcaf55294af8f9e1becba09d1f471
Diffstat (limited to 'gnu/packages/package-management.scm')
| -rw-r--r-- | gnu/packages/package-management.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6e78d0e849..4e58490265 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.23.4") + (version "2.24.15") (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 "0lbj7dcg7wqgc8yclmgflsv2wlkc53h55dzwalfp2w126phhgs5f")) + (base32 "1xvcj7sws2w8yv3cn58chjjix7rjs63w1m2343v80i3gphf8ayhq")) (patches (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) @@ -915,9 +915,11 @@ by using a Xapian cache.") "fmt" "nix-profile" "plugins" - "shell" - "flakes/config") + "shell") "|") ")\\.sh")) + "")) + (substitute* "tests/functional/flakes/local.mk" + ((".*config\\.sh.*") ""))))))) (native-inputs (list autoconf @@ -948,6 +950,7 @@ by using a Xapian cache.") nlohmann-json openssl sqlite + toml11 xz zlib) (if (or (target-x86-64?) |