lol

git: packaging cleanup (#432010)

authored by philiptaron.tngl.sh and committed by

GitHub 6191a4bf 57aebf16

+8 -6
+8 -6
pkgs/applications/version-management/git/default.nix
··· 96 96 separateDebugInfo = true; 97 97 __structuredAttrs = true; 98 98 99 - hardeningDisable = [ "format" ]; 100 - 101 99 enableParallelBuilding = true; 102 100 enableParallelInstalling = true; 103 101 104 102 patches = [ 103 + # This patch does two things: (1) use the right name for `docbook2texi', 104 + # and (2) make sure `gitman.info' isn't produced since it's broken 105 + # (duplicate node names). 105 106 ./docbook2texi.patch 107 + # Fix references to gettext.sh at runtime: hard-code it to 108 + # ${pkgs.gettext}/bin/gettext.sh instead of assuming gettext.sh is in $PATH 106 109 ./git-sh-i18n.patch 110 + # Do not search for sendmail in /usr, only in $PATH 107 111 ./git-send-email-honor-PATH.patch 108 - ./installCheck-path.patch 109 112 ] 110 113 ++ lib.optionals withSsh [ 114 + # Hard-code the ssh executable to ${pkgs.openssh}/bin/ssh instead of 115 + # searching in $PATH 111 116 ./ssh-path.patch 112 117 ]; 113 118 ··· 476 481 disable_test t1301-shared-repo 477 482 # /build/git-2.44.0/contrib/completion/git-completion.bash: line 452: compgen: command not found 478 483 disable_test t9902-completion 479 - 480 - # Our patched gettext never fallbacks 481 - disable_test t0201-gettext-fallbacks 482 484 '' 483 485 + lib.optionalString (!sendEmailSupport) '' 484 486 # Disable sendmail tests