diff options
| -rw-r--r-- | gnu/packages/package-management.scm | 8 | ||||
| -rw-r--r-- | gnu/packages/patches/nix-dont-build-html-doc.diff | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 33abdc62b9..af8bc55dc3 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -857,16 +857,16 @@ by using a Xapian cache.") (define-public nix (package (name "nix") - (version "2.16.1") + (version "2.17.2") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/NixOS/nix") - (commit version))) + (url "https://github.com/NixOS/nix") + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1rca8ljd33dmvh9bqk6sy1zxk97aawcr6k1f7hlm4d1cd9mrcw7x")) + (base32 "141c2cr1f7k1iaygk5hy02m6f7zrmj5x3m3kz91rpjvvh1bn15qg")) (patches (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packages/patches/nix-dont-build-html-doc.diff index 2eb45117b0..cab06b9692 100644 --- a/gnu/packages/patches/nix-dont-build-html-doc.diff +++ b/gnu/packages/patches/nix-dont-build-html-doc.diff @@ -5,8 +5,8 @@ Author: Zhu Zihao <all_but_last@163.com> --- a/doc/manual/local.mk +++ b/doc/manual/local.mk -@@ -138,11 +138,6 @@ - $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-builtins > $@.tmp +@@ -144,11 +144,6 @@ $(d)/language.json: $(bindir)/nix + $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-language > $@.tmp @mv $@.tmp $@ -# Generate the HTML manual. @@ -17,11 +17,11 @@ Author: Zhu Zihao <all_but_last@163.com> # Generate 'nix' manpages. install: $(mandir)/man1/nix3-manpages man: doc/manual/generated/man1/nix3-manpages -@@ -167,23 +162,4 @@ +@@ -173,23 +168,4 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli done @touch $@ --$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md $(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 +-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md $(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 - $(trace-gen) \ - tmp="$$(mktemp -d)"; \ - cp -r doc/manual "$$tmp"; \ |