summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Graves <ngraves@ngraves.fr>2025-07-02 19:22:43 +0200
committerAndreas Enge <andreas@enge.fr>2025-07-22 12:53:07 +0200
commitda7d74ced73446b440e66e97fd0736b04985269a (patch)
treefef21a9a226703b89ca2f8e8174de06aef2b2eb9
parentd72a47ece231bb75c9583e2be493f31b4c9ba7ee (diff)
gnu: nix: Update to 2.21.5.
* gnu/packages/package-management.scm (nix): Update to 2.21.5. [arguments]{phases}: Add phase 'inject-config.sub. [inputs]: Add config. Change-Id: I7f8d4081467641b6320f0cdc280e419f42d7323d
-rw-r--r--gnu/packages/package-management.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index c83902ddde..8be4cb01bf 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.20.9")
+ (version "2.21.5")
(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 "0w1rdgchsrb3xbzs9213kv966cshyp42fhhil0fgqgybnfnjdfvg"))
+ (base32 "13bc2ykw19hi4nqs0gz3iz0y773dgrbbv2c72q4q7gd1vsjwpr7z"))
(patches
(search-patches "nix-dont-build-html-doc.diff"))))
(build-system gnu-build-system)
@@ -877,6 +877,10 @@ by using a Xapian cache.")
#:configure-flags #~(list "--sysconfdir=/etc" "--enable-gc")
#:phases
#~(modify-phases %standard-phases
+ (add-after 'unpack 'inject-config.sub
+ (lambda* (#:key inputs #:allow-other-keys)
+ (symlink (search-input-file inputs "bin/config.sub")
+ "config/config.sub")))
(replace 'install
;; Don't try & fail to create subdirectories in /etc, but keep them
;; in the output as examples.
@@ -915,6 +919,7 @@ by using a Xapian cache.")
autoconf-archive
automake
bison
+ config
flex
googletest
jq