From de3e686cc895d81d6fa53f60463bb4eb6db9677e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 17 Jul 2023 16:07:40 +0200 Subject: [PATCH] python310Packages.pygit2: pin libgit2 to libgit2, run tests again --- .../python-modules/pygit2/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 0ce6dc642448..e7360816691d 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/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" ];