Merge pull request #243981 from SuperSandro2000/libgit2

libgit2: 1.6.4 -> 1.7.0

pkgs/development/libraries/libgit2/default.nix

@@ -19,14 +19,14 @@
 
 stdenv.mkDerivation rec {
   pname = "libgit2";
-  version = "1.6.4";
+  version = "1.7.0";
   # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib
 
   src = fetchFromGitHub {
     owner = "libgit2";
     repo = "libgit2";
     rev = "v${version}";
-    hash = "sha256-lW3mokVKsbknVj2xsxEbeZH4IdKZ0aIgGutzenS0Eh0=";
+    hash = "sha256-3ZVBGd2T5DQKsDEc5a7pS0yz01+rDCszU9ZK0zxvfyQ=";
   };
 
   cmakeFlags = [

pkgs/development/python-modules/pygit2/default.nix

@@ -4,6 +4,7 @@
 , cacert
 , cached-property
 , cffi
+, fetchFromGitHub
 , fetchPypi
 , isPyPy
 , libgit2
@@ -12,6 +13,19 @@
 , pythonOlder
 }:
 
+let
+  libgit2' = libgit2.overrideAttrs (_: rec {
+    version = "1.6.4";
+
+    src = fetchFromGitHub {
+      owner = "libgit2";
+      repo = "libgit2";
+      rev = "v${version}";
+      hash = "sha256-lW3mokVKsbknVj2xsxEbeZH4IdKZ0aIgGutzenS0Eh0=";
+    };
+  });
+in
+
 buildPythonPackage rec {
   pname = "pygit2";
   version = "1.12.2";
@@ -29,7 +43,7 @@ buildPythonPackage rec {
   '';
 
   buildInputs = [
-    libgit2
+    libgit2'
   ];
 
   propagatedBuildInputs = [
@@ -58,14 +72,6 @@ buildPythonPackage rec {
   # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582674047
   SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
-  # setup.py check is broken
-  # https://github.com/libgit2/pygit2/issues/868
-  dontUseSetuptoolsCheck = true;
-
-  # TODO: Test collection is failing
-  # https://github.com/NixOS/nixpkgs/pull/72544#issuecomment-582681068
-  doCheck = false;
-
   pythonImportsCheck = [
     "pygit2"
   ];