Skip to content

git: packaging cleanup #432010

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

Merged
philiptaron merged 3 commits into from
Aug 10, 2025
Merged

git: packaging cleanup #432010

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a959b9c
git: re-enable "format" hardening
balsoft Jul 22, 2025
d10d07d
git: re-enable a test and remove unneeded patch
balsoft Aug 8, 2025
3f2212c
git: add comments for patches
balsoft Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions pkgs/applications/version-management/git/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,23 @@ stdenv.mkDerivation (finalAttrs: {
separateDebugInfo = true;
__structuredAttrs = true;

hardeningDisable = [ "format" ];

enableParallelBuilding = true;
enableParallelInstalling = true;

patches = [
# This patch does two things: (1) use the right name for `docbook2texi',
# and (2) make sure `gitman.info' isn't produced since it's broken
# (duplicate node names).
./docbook2texi.patch
# Fix references to gettext.sh at runtime: hard-code it to
# ${pkgs.gettext}/bin/gettext.sh instead of assuming gettext.sh is in $PATH
./git-sh-i18n.patch
# Do not search for sendmail in /usr, only in $PATH
./git-send-email-honor-PATH.patch
./installCheck-path.patch
]
++ lib.optionals withSsh [
# Hard-code the ssh executable to ${pkgs.openssh}/bin/ssh instead of
# searching in $PATH
./ssh-path.patch
];

Expand Down Expand Up @@ -476,9 +481,6 @@ stdenv.mkDerivation (finalAttrs: {
disable_test t1301-shared-repo
# /build/git-2.44.0/contrib/completion/git-completion.bash: line 452: compgen: command not found
disable_test t9902-completion

# Our patched gettext never fallbacks
disable_test t0201-gettext-fallbacks
''
+ lib.optionalString (!sendEmailSupport) ''
# Disable sendmail tests
Expand Down
Loading