amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: nix: Update to 2.24.15.

Browse source 
* 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
This commit is contained in:
Nicolas Graves 2025-07-02 19:26:51 +02:00 • committed by Andreas Enge
parent 7a2be11c8b
commit 9a87de50b4
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gnu/packages/package-management.scm
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.23.4") (version "2.24.15")
(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 "0lbj7dcg7wqgc8yclmgflsv2wlkc53h55dzwalfp2w126phhgs5f")) (base32 "1xvcj7sws2w8yv3cn58chjjix7rjs63w1m2343v80i3gphf8ayhq"))
(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)
@ -915,9 +915,11 @@ by using a Xapian cache.")
"fmt" "fmt"
"nix-profile" "nix-profile"
"plugins" "plugins"
"shell" "shell")
"flakes/config")
"|") ")\\.sh")) "|") ")\\.sh"))
""))
(substitute* "tests/functional/flakes/local.mk"
((".*config\\.sh.*")
""))))))) "")))))))
(native-inputs (native-inputs
(list autoconf (list autoconf
@ -948,6 +950,7 @@ by using a Xapian cache.")
nlohmann-json nlohmann-json
openssl openssl
sqlite sqlite
toml11
xz xz
zlib) zlib)
(if (or (target-x86-64?) (if (or (target-x86-64?)

8
gnu/packages/patches/nix-dont-build-html-doc.diff
View file

@ -5,7 +5,7 @@ Author: Zhu Zihao <all_but_last@163.com>
--- a/doc/manual/local.mk --- a/doc/manual/local.mk
+++ b/doc/manual/local.mk +++ b/doc/manual/local.mk
@@ -172,21 +172,6 @@ $(d)/src/SUMMARY-rl-next.md: $(d)/src/release-notes/rl-next.md @@ -166,21 +166,6 @@ $(d)/src/SUMMARY-rl-next.md: $(d)/src/release-notes/rl-next.md
true > $@; \ true > $@; \
fi fi
@ -27,16 +27,16 @@ Author: Zhu Zihao <all_but_last@163.com>
# Generate 'nix' manpages. # Generate 'nix' manpages.
.PHONY: manpages .PHONY: manpages
manpages: $(mandir)/man1/nix3-manpages manpages: $(mandir)/man1/nix3-manpages
@@ -212,26 +197,3 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli @@ -206,26 +191,3 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli
rm $$tmpFile; \ rm $$tmpFile; \
done done
@touch $@ @touch $@
- -
-# the `! -name 'contributing.md'` filter excludes the one place where -# the `! -name 'documentation.md'` filter excludes the one place where
-# `@docroot@` is to be preserved for documenting the mechanism -# `@docroot@` is to be preserved for documenting the mechanism
-# FIXME: maybe contributing guides should live right next to the code -# FIXME: maybe contributing guides should live right next to the code
-# instead of in the manual -# instead of in the manual
-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/store/types $(d)/src/command-ref/new-cli $(d)/src/contributing/experimental-feature-descriptions.md $(d)/src/command-ref/conf-file.md $(d)/src/language/builtins.md $(d)/src/language/builtin-constants.md $(d)/src/release-notes/rl-next.md $(d)/src/figures $(d)/src/favicon.png $(d)/src/favicon.svg -$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/store/types $(d)/src/command-ref/new-cli $(d)/src/development/experimental-feature-descriptions.md $(d)/src/command-ref/conf-file.md $(d)/src/language/builtins.md $(d)/src/release-notes/rl-next.md $(d)/src/figures $(d)/src/favicon.png $(d)/src/favicon.svg
- $(trace-gen) \ - $(trace-gen) \
- tmp="$$(mktemp -d)"; \ - tmp="$$(mktemp -d)"; \
- cp -r doc/manual "$$tmp"; \ - cp -r doc/manual "$$tmp"; \