From a959b9c014d1635463cdcffe51e4d33dbc28e983 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Tue, 22 Jul 2025 16:36:35 +0400 Subject: [PATCH 1/3] git: re-enable "format" hardening Remove hardeningDisable = ["format"] because it is not necessary anymore (the package builds without disabling it). --- pkgs/applications/version-management/git/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 93452cac87f2..cb34b54440c0 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -96,8 +96,6 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; __structuredAttrs = true; - hardeningDisable = [ "format" ]; - enableParallelBuilding = true; enableParallelInstalling = true; From d10d07d6a17504fa407a062a3fac8d229471a39e Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Fri, 8 Aug 2025 18:59:34 +0400 Subject: [PATCH 2/3] git: re-enable a test and remove unneeded patch Re-enables a test that now passes, and removes an unneeded patch that was useful for testing at some point. --- pkgs/applications/version-management/git/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index cb34b54440c0..50de22322407 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -103,7 +103,6 @@ stdenv.mkDerivation (finalAttrs: { ./docbook2texi.patch ./git-sh-i18n.patch ./git-send-email-honor-PATH.patch - ./installCheck-path.patch ] ++ lib.optionals withSsh [ ./ssh-path.patch @@ -474,9 +473,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 From 3f2212cdbbe320d320830b7045502ade72fa4a09 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Fri, 8 Aug 2025 17:27:06 +0400 Subject: [PATCH 3/3] git: add comments for patches Adds inline comments for all patches as per CONTRIBUTING.md --- pkgs/applications/version-management/git/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 50de22322407..0ed21e8e034f 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -100,11 +100,19 @@ stdenv.mkDerivation (finalAttrs: { 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 ] ++ lib.optionals withSsh [ + # Hard-code the ssh executable to ${pkgs.openssh}/bin/ssh instead of + # searching in $PATH ./ssh-path.patch ];