From 765ccf25a9becf05c96f5236eb0e0193e3ba7d70 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 5 Aug 2023 18:03:59 -0400
Subject: [PATCH 1/5] libgit2_1_6: init at 1.6.4

Some packages still depend on libgit2 1.6
---
 pkgs/top-level/all-packages.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee9b23c5b497..1c030cf89893 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21281,6 +21281,17 @@ with pkgs;
     patches = [];
   };
 
+  libgit2_1_6 = libgit2.overrideAttrs rec {
+    version = "1.6.4";
+    src = fetchFromGitHub {
+      owner = "libgit2";
+      repo = "libgit2";
+      rev = "v${version}";
+      hash = "sha256-lW3mokVKsbknVj2xsxEbeZH4IdKZ0aIgGutzenS0Eh0=";
+    };
+    patches = [ ];
+  };
+
   libgit2-glib = callPackage ../development/libraries/libgit2-glib { };
 
   libhsts = callPackage ../development/libraries/libhsts { };

From 0712c5ffcecae3194b658250de1af0963a50ea27 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 5 Aug 2023 18:08:17 -0400
Subject: [PATCH 2/5] python310Packages.pygit2: use libgit2_1_6

---
 .../python-modules/pygit2/default.nix         | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index b92e9a1cd6c1..c7e4979d1372 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -4,30 +4,14 @@
 , cacert
 , cached-property
 , cffi
-, fetchFromGitHub
 , fetchPypi
 , isPyPy
-, libgit2
+, libgit2_1_6
 , pycparser
 , pytestCheckHook
 , pythonOlder
 }:
 
-let
-  libgit2' = libgit2.overrideAttrs (_: rec {
-    version = "1.6.4";
-
-    src = fetchFromGitHub {
-      owner = "libgit2";
-      repo = "libgit2";
-      rev = "v${version}";
-      hash = "sha256-lW3mokVKsbknVj2xsxEbeZH4IdKZ0aIgGutzenS0Eh0=";
-    };
-
-    patches = [];
-  });
-in
-
 buildPythonPackage rec {
   pname = "pygit2";
   version = "1.12.2";
@@ -41,11 +25,11 @@ buildPythonPackage rec {
   };
 
   preConfigure = lib.optionalString stdenv.isDarwin ''
-    export DYLD_LIBRARY_PATH="${libgit2}/lib"
+    export DYLD_LIBRARY_PATH="${libgit2_1_6}/lib"
   '';
 
   buildInputs = [
-    libgit2'
+    libgit2_1_6
   ];
 
   propagatedBuildInputs = [

From 03d6f1cab8815764d2bf04860ac58274a45b99e0 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 5 Aug 2023 18:10:17 -0400
Subject: [PATCH 3/5] gql: use libgit2_1_6

---
 pkgs/applications/version-management/gql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/applications/version-management/gql/default.nix
index 80cb28a09e5b..b5682ad4bafa 100644
--- a/pkgs/applications/version-management/gql/default.nix
+++ b/pkgs/applications/version-management/gql/default.nix
@@ -2,7 +2,7 @@
 , rustPlatform
 , fetchFromGitHub
 , pkg-config
-, libgit2
+, libgit2_1_6
 , zlib
 }:
 
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   buildInputs = [
-    libgit2
+    libgit2_1_6
     zlib
   ];
 

From f5768b2b7691cf227c6b5fc0c150ab969a0fa663 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 5 Aug 2023 18:25:59 -0400
Subject: [PATCH 4/5] gex: use libgit2_1_6

---
 pkgs/applications/version-management/gex/default.nix | 8 ++------
 pkgs/top-level/all-packages.nix                      | 4 +---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/version-management/gex/default.nix b/pkgs/applications/version-management/gex/default.nix
index 5cf6172a4211..40a7fc6ba79b 100644
--- a/pkgs/applications/version-management/gex/default.nix
+++ b/pkgs/applications/version-management/gex/default.nix
@@ -1,10 +1,8 @@
 { lib
-, stdenv
 , rustPlatform
 , fetchFromGitHub
 , pkg-config
-, libgit2
-, Security
+, libgit2_1_6
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -21,9 +19,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    libgit2
-  ] ++ lib.optionals stdenv.isDarwin [
-    Security
+    libgit2_1_6
   ];
 
   cargoHash = "sha256-28sMY47LAdaGmPNmxeu/w1Pn6AV3JlWbxFcit5pLkI0";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c030cf89893..32e1cd2baa24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2085,9 +2085,7 @@ with pkgs;
 
   diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { };
 
-  gex = callPackage ../applications/version-management/gex {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  gex = callPackage ../applications/version-management/gex { };
 
   gfold = callPackage ../applications/version-management/gfold {
     inherit (darwin.apple_sdk.frameworks) Security;

From add32c92e71823976d7a8dd429ce6e45d79b680a Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sun, 6 Aug 2023 11:00:47 -0400
Subject: [PATCH 5/5] nix-init: use libgit2_1_6

---
 pkgs/tools/nix/nix-init/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix
index d6a5df6272f4..1e24de6d1961 100644
--- a/pkgs/tools/nix/nix-init/default.nix
+++ b/pkgs/tools/nix/nix-init/default.nix
@@ -6,7 +6,7 @@
 , installShellFiles
 , pkg-config
 , bzip2
-, libgit2
+, libgit2_1_6
 , openssl
 , zlib
 , zstd
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     bzip2
     curl
-    libgit2
+    libgit2_1_6
     openssl
     zlib
     zstd