diff options
| author | Zhu Zihao <all_but_last@163.com> | 2022-01-11 23:10:01 +0800 |
|---|---|---|
| committer | Oleg Pykhalov <go.wigust@gmail.com> | 2022-01-21 16:45:33 +0300 |
| commit | 8ed6a8884c2e6deab80da6e416b991afbc58df35 (patch) | |
| tree | 3639a99fcb8afb11071917267567316855bd0da6 /gnu/packages/patches | |
| parent | cd6bd434fd4e2b47a41b478b68ab017a03881b46 (diff) | |
| download | guix-8ed6a8884c2e6deab80da6e416b991afbc58df35.tar.gz guix-8ed6a8884c2e6deab80da6e416b991afbc58df35.zip | |
gnu: nix: Update to 2.4.
* gnu/packages/package-management.scm (nix): Update to 2.4.
[source]: Switch to Github repository since upstream no longer provides
tarball.
[native-inputs]: Add autoconf, autoconf-archive, automake, bison, flex, gcc,
googletest, jq, libtool.
[inputs]: Add libarchive, libcpuid, lowdown, zlib.
* gnu/packages/patches/nix-dont-build-html-doc.diff: New file.
* gnu/local.mk(dist_patch_DATA): Add corresponding entry.
Signed-off-by: Oleg Pykhalov <go.wigust@gmail.com>
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/nix-dont-build-html-doc.diff | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packages/patches/nix-dont-build-html-doc.diff new file mode 100644 index 0000000000..79142bc215 --- /dev/null +++ b/gnu/packages/patches/nix-dont-build-html-doc.diff @@ -0,0 +1,26 @@ +"--enable-doc-gen" configure flag will enable HTML document generation that requires mdbook. +We can't simply disable it because we need manpages. + +Author: Zhu Zihao <all_but_last@163.com> + +diff --git a/doc/manual/local.mk b/doc/manual/local.mk +index e43d9f2fb..c323d1847 100644 +--- a/doc/manual/local.mk ++++ b/doc/manual/local.mk +@@ -69,8 +69,6 @@ $(d)/builtins.json: $(bindir)/nix + $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-builtins > $@.tmp + @mv $@.tmp $@ + +-# Generate the HTML manual. +-install: $(docdir)/manual/index.html + + # Generate 'nix' manpages. + install: $(mandir)/man1/nix3-manpages +@@ -94,7 +92,5 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli + done + @touch $@ + +-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/conf-file.md $(d)/src/expressions/builtins.md $(call rwildcard, $(d)/src, *.md) +- $(trace-gen) RUST_LOG=warn mdbook build doc/manual -d $(DESTDIR)$(docdir)/manual + + endif |