From 0712c5ffcecae3194b658250de1af0963a50ea27 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 5 Aug 2023 18:08:17 -0400 Subject: [PATCH] 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 = [