Merge #247408: libgit2_1_6: init at 1.6.4

...into staging-next

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";

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
   ];
 

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 = [

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

pkgs/top-level/all-packages.nix

@@ -2087,9 +2087,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;
@@ -21294,6 +21292,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 { };