From c775bd5d2930a892727bced231be594869aa8f29 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 19 Oct 2025 17:10:25 +0200 Subject: [PATCH] Revert "nix/libgit2: Unpatch irrelevant fix for quick delivery" This reverts commit f7b37bf885e475d0ceab580ee9e5b5c7f3c84f14. That commit was a workaround to avoid rebuilding Nix and the NixOS tests, which was a safe thing to do. This commit targets the staging-nixos cycle, so that we can make Nix use the normal libgit2 package again. --- pkgs/tools/package-management/nix/dependencies.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/tools/package-management/nix/dependencies.nix b/pkgs/tools/package-management/nix/dependencies.nix index 7f3b5780607a..ed5a63ce3ecf 100644 --- a/pkgs/tools/package-management/nix/dependencies.nix +++ b/pkgs/tools/package-management/nix/dependencies.nix @@ -34,12 +34,5 @@ regular@{ # only a stripped down version is built which takes a lot less resources to build requiredSystemFeatures = [ ]; }; - - libgit2 = pkgs.libgit2.overrideAttrs (old: { - # Drop the SSH buffer overflow patch to avoid rebuilding Nix - patches = lib.filter (p: !lib.hasSuffix "fix-ssh-custom-heap-buffer-overflow.patch" (toString p)) ( - old.patches or [ ] - ); - }); }; }