From ae7447170667497a992c9333bafe731691b46aba Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 9 Feb 2025 21:01:08 +0100
Subject: [PATCH] nixVersions.nix_2_26: Drop libgit2-thin-packfile override

---
 pkgs/tools/package-management/nix/2_26/componentized.nix | 2 --
 pkgs/tools/package-management/nix/2_26/dependencies.nix  | 4 ----
 pkgs/tools/package-management/nix/default.nix            | 4 +---
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/tools/package-management/nix/2_26/componentized.nix b/pkgs/tools/package-management/nix/2_26/componentized.nix
index 9dbf54392fb4..48f2d052d36f 100644
--- a/pkgs/tools/package-management/nix/2_26/componentized.nix
+++ b/pkgs/tools/package-management/nix/2_26/componentized.nix
@@ -6,7 +6,6 @@
   newScope,
   pkgs,
   stdenv,
-  libgit2-thin-packfile,
   ...
 }:
 let
@@ -44,7 +43,6 @@ let
           inherit pkgs;
           inherit stdenv;
           inherit src;
-          inherit libgit2-thin-packfile;
         };
       };
 in
diff --git a/pkgs/tools/package-management/nix/2_26/dependencies.nix b/pkgs/tools/package-management/nix/2_26/dependencies.nix
index fddcf228e7cb..73739e2edcc5 100644
--- a/pkgs/tools/package-management/nix/2_26/dependencies.nix
+++ b/pkgs/tools/package-management/nix/2_26/dependencies.nix
@@ -7,7 +7,6 @@
   pkgs,
 
   stdenv,
-  libgit2-thin-packfile,
 }:
 
 let
@@ -139,7 +138,6 @@ let
 in
 scope: {
   inherit stdenv;
-  inherit libgit2-thin-packfile;
 
   aws-sdk-cpp =
     (pkgs.aws-sdk-cpp.override {
@@ -159,8 +157,6 @@ scope: {
     enableLargeConfig = true;
   };
 
-  libgit2 = libgit2-thin-packfile;
-
   inherit resolvePath filesetToSource;
 
   mkMesonDerivation = mkPackageBuilder [
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 53cee6fcb819..23b11f1c6285 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -164,9 +164,7 @@ in lib.makeExtensible (self: ({
     self_attribute_name = "nix_2_25";
   };
 
-  nix_2_26 = (callPackage ./2_26/componentized.nix {
-    inherit libgit2-thin-packfile;
-  }).overrideAttrs (this: old: {
+  nix_2_26 = (callPackage ./2_26/componentized.nix { }).overrideAttrs (this: old: {
     passthru = old.passthru or {} // {
       tests =
         old.passthru.tests or {}