pyrox.dev
lol
git: packaging cleanup (#432010)
authored by
GitHub
6191a4bf
57aebf16
+8
-6
pkgs/applications/version-management/git/default.nix
+8
-6
pkgs/applications/version-management/git/default.nix
···
96
separateDebugInfo = true;
97
__structuredAttrs = true;
98
99
-
hardeningDisable = [ "format" ];
100
-
101
enableParallelBuilding = true;
102
enableParallelInstalling = true;
103
104
patches = [
105
./docbook2texi.patch
106
./git-sh-i18n.patch
107
./git-send-email-honor-PATH.patch
108
-
./installCheck-path.patch
109
]
110
++ lib.optionals withSsh [
111
./ssh-path.patch
112
];
113
···
476
disable_test t1301-shared-repo
477
# /build/git-2.44.0/contrib/completion/git-completion.bash: line 452: compgen: command not found
478
disable_test t9902-completion
479
-
480
-
# Our patched gettext never fallbacks
481
-
disable_test t0201-gettext-fallbacks
482
''
483
+ lib.optionalString (!sendEmailSupport) ''
484
# Disable sendmail tests
···
96
separateDebugInfo = true;
97
__structuredAttrs = true;
98
99
enableParallelBuilding = true;
100
enableParallelInstalling = true;
101
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).
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
109
./git-sh-i18n.patch
110
+
# Do not search for sendmail in /usr, only in $PATH
111
./git-send-email-honor-PATH.patch
112
]
113
++ lib.optionals withSsh [
114
+
# Hard-code the ssh executable to ${pkgs.openssh}/bin/ssh instead of
115
+
# searching in $PATH
116
./ssh-path.patch
117
];
118
···
481
disable_test t1301-shared-repo
482
# /build/git-2.44.0/contrib/completion/git-completion.bash: line 452: compgen: command not found
483
disable_test t9902-completion
484
''
485
+ lib.optionalString (!sendEmailSupport) ''
486
# Disable sendmail tests