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.25.5.

Browse source 
* gnu/packages/package-management.scm (nix): Update to 2.25.5.
[inputs]: Replace libgit2 by libgit2-1.9. Add libblake3.
* gnu/packages/patches/nix-dont-build-html-doc.diff: Update accordingly.

Change-Id: I6f585b463899942bf8d6b33be7a37e7036ec0324
This commit is contained in:
Nicolas Graves 2025-07-02 19:30:45 +02:00 • committed by Andreas Enge
parent 9a87de50b4
commit 432d9f4df4
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
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.24.15") (version "2.25.5")
(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 "1xvcj7sws2w8yv3cn58chjjix7rjs63w1m2343v80i3gphf8ayhq")) (base32 "150678l5bw8d8gaagsqy9fxlrxhvdx3cmphbn6b2l2c7pa3d06pp"))
(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)
@ -942,8 +942,9 @@ by using a Xapian cache.")
curl curl
editline editline
libarchive libarchive
libblake3
libgc libgc
libgit2 libgit2-1.9
libseccomp libseccomp
libsodium libsodium
lowdown lowdown

17
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
@@ -166,21 +166,6 @@ $(d)/src/SUMMARY-rl-next.md: $(d)/src/release-notes/rl-next.md @@ -166,21 +166,6 @@ $(d)/source/SUMMARY-rl-next.md: $(d)/source/release-notes/rl-next.md
true > $@; \ true > $@; \
fi fi
@ -27,7 +27,7 @@ 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
@@ -206,26 +191,3 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli @@ -206,31 +191,3 @@ doc/manual/generated/man1/nix3-manpages: $(d)/source/command-ref/new-cli
rm $$tmpFile; \ rm $$tmpFile; \
done done
@touch $@ @touch $@
@ -36,7 +36,7 @@ Author: Zhu Zihao <all_but_last@163.com>
-# `@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/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 -$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/source/SUMMARY.md $(d)/source/store/types $(d)/source/command-ref/new-cli $(d)/source/development/experimental-feature-descriptions.md $(d)/source/command-ref/conf-file.md $(d)/source/language/builtins.md $(d)/source/release-notes/rl-next.md $(d)/source/figures $(d)/source/favicon.png $(d)/source/favicon.svg
- $(trace-gen) \ - $(trace-gen) \
- tmp="$$(mktemp -d)"; \ - tmp="$$(mktemp -d)"; \
- cp -r doc/manual "$$tmp"; \ - cp -r doc/manual "$$tmp"; \
@ -44,12 +44,17 @@ Author: Zhu Zihao <all_but_last@163.com>
- $(call process-includes,$$file,$$file); \ - $(call process-includes,$$file,$$file); \
- done; \ - done; \
- find "$$tmp" -name '*.md' ! -name 'documentation.md' | while read -r file; do \ - find "$$tmp" -name '*.md' ! -name 'documentation.md' | while read -r file; do \
- docroot="$$(realpath --relative-to="$$(dirname "$$file")" $$tmp/manual/src)"; \ - docroot="$$(realpath --relative-to="$$(dirname "$$file")" $$tmp/manual/source)"; \
- sed -i "s,@docroot@,$$docroot,g" "$$file"; \ - sed -i "s,@docroot@,$$docroot,g" "$$file"; \
- done; \ - done; \
- set -euo pipefail; \ - set -euo pipefail; \
- RUST_LOG=warn mdbook build "$$tmp/manual" -d $(DESTDIR)$(docdir)/manual.tmp 2>&1 \ - ( \
- | { grep -Fv "because fragment resolution isn't implemented" || :; }; \ - cd "$$tmp/manual"; \
- RUST_LOG=warn \
- MDBOOK_SUBSTITUTE_SEARCH=$(d)/source \
- mdbook build -d $(DESTDIR)$(docdir)/manual.tmp 2>&1 \
- | { grep -Fv "because fragment resolution isn't implemented" || :; } \
- ); \
- rm -rf "$$tmp/manual" - rm -rf "$$tmp/manual"
- @rm -rf $(DESTDIR)$(docdir)/manual - @rm -rf $(DESTDIR)$(docdir)/manual
- @mv $(DESTDIR)$(docdir)/manual.tmp/html $(DESTDIR)$(docdir)/manual - @mv $(DESTDIR)$(docdir)/manual.tmp/html $(DESTDIR)$(docdir)/manual