about summary refs log tree commit diff
path: root/pkgs/development/python-modules/pygit2
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-10-30 17:28:07 -0500
committerWill Dietz <github@wdtz.org>2018-11-21 15:44:25 -0600
commita5c19d3b891905c4a3dd75445526e843b86d2ebe (patch)
tree96fd38c6035ebeb246f411f081af5a619d9ecef9 /pkgs/development/python-modules/pygit2
parent28b4b4b1e49309e465e0c35adb655007a08c2f23 (diff)
pygit2: 0.26.4 -> 0.27.2
* match major libgit2 version
* upstream patch to remove unnecessary requirement
Diffstat (limited to 'pkgs/development/python-modules/pygit2')
-rw-r--r--pkgs/development/python-modules/pygit2/default.nix16
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index 72e09bf98f928..23d90ebce2ad2 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -1,19 +1,25 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi, isPyPy, libgit2, six, cffi }:
+{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, isPyPy, libgit2_0_27, six, cffi, pycparser }:
 
 buildPythonPackage rec {
   pname = "pygit2";
-  version = "0.26.4";
+  version = "0.27.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a8a0ecce4aadac2675afa5bcda0f698bfe39ec61ac1e15b9264704d1b41bb390";
+    sha256 = "0d9bgxd6ch5jxz0j5cmx7c4kw933g8pgm2zxf3id1a6w9g2r7hpw";
   };
 
   preConfigure = lib.optionalString stdenv.isDarwin ''
-    export DYLD_LIBRARY_PATH="${libgit2}/lib"
+    export DYLD_LIBRARY_PATH="${libgit2_0_27}/lib"
   '';
 
-  propagatedBuildInputs = [ libgit2 six ] ++ lib.optional (!isPyPy) cffi;
+  patches = [ (fetchpatch {
+    name = "dont-require-old-pycparser"; # https://github.com/libgit2/pygit2/issues/819
+    url = https://github.com/libgit2/pygit2/commit/1eaba181577de206d3d43ec7886d0353fc0c9f2a.patch;
+    sha256 = "18x1fpmywhjjr4lvakwmy34zpxfqi8pqqj48g1wcib39lh3s7l4f";
+  }) ];
+
+  propagatedBuildInputs = [ libgit2_0_27 six pycparser ] ++ lib.optional (!isPyPy) cffi;
 
   preCheck = ''
     # disable tests that require networking