Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git: make manual reproducible #105498

Merged
merged 1 commit into from Dec 1, 2020
Merged

git: make manual reproducible #105498

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions pkgs/applications/version-management/git-and-tools/git/default.nix
View file
Open in desktop
@@ -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
Expand Down Expand Up @@ -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 = ''
Expand Down Expand Up @@ -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 \
andir marked this conversation as resolved.
Show resolved Hide resolved
-C Documentation ''

+ (if guiSupport then ''
Expand Down