diff options
| author | Arnout Engelen <arnout@bzzt.net> | 2020-11-30 22:32:59 +0100 |
|---|---|---|
| committer | Arnout Engelen <arnout@bzzt.net> | 2020-12-01 08:33:58 +0100 |
| commit | 91099b08aebb1aa5c98fe2b5b33f37d6f927d194 (patch) | |
| tree | 5a7a1bde6c1b4af120b553809d5c7e0a410a4b29 /pkgs/applications | |
| parent | 6cea12ccff6e279f0bc1f91aa6a898d642e03320 (diff) | |
git: make manual reproducible
This makes the git HTML manual reproducible.
It also removes the `git.info` manual, since this one is
basically entirely broken anyway. This likely happened
when we migrated from asciidoc to asciidoctor in #102020.
I don't suggest going back to asciidoc: that would
re-introduce a python2 dependency and another
reproducibility issue with the HTML docs.
Co-Authored-By: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index b7e4f3e6c483..57f6703762d1 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,4 +1,5 @@ { fetchurl, stdenv, buildPackages +, fetchpatch , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , openssh, pcre2 @@ -51,6 +52,12 @@ stdenv.mkDerivation { ./ssh-path.patch ./git-send-email-honor-PATH.patch ./installCheck-path.patch + (fetchpatch { + # https://github.com/git/git/pull/925 + name = "make-manual-reproducible.patch"; + url = "https://github.com/git/git/commit/7a68e9e0b8eda91eb576bbbc5ed66298f3ab761c.patch"; + sha256 = "02naws82pd3vvwrrgqn91kid8qkjihyjaz1ahgjz8qlmnn2avf5n"; + }) ]; postPatch = '' @@ -229,8 +236,8 @@ stdenv.mkDerivation { notSupported $out/libexec/git-core/git-send-email '') - + stdenv.lib.optionalString withManual ''# Install man pages and Info manual - make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES USE_ASCIIDOCTOR=1 PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html install-info \ + + stdenv.lib.optionalString withManual ''# Install man pages + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES USE_ASCIIDOCTOR=1 PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ -C Documentation '' + (if guiSupport then '' |