diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-06-06 10:48:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-06 10:48:42 +0200 |
commit | 56666959066d7f91aad61fbd64392b5aecf11555 (patch) | |
tree | 736ae718f15bd18cb693df7640709e29a6ff1b30 /pkgs/top-level | |
parent | 09e59ad5791d965d9bfbc51fdc27a687cae2e6b9 (diff) | |
parent | b0e86e6cd895aa8ed6529d16666f6311e1499a4a (diff) | |
download | nixlib-56666959066d7f91aad61fbd64392b5aecf11555.tar nixlib-56666959066d7f91aad61fbd64392b5aecf11555.tar.gz nixlib-56666959066d7f91aad61fbd64392b5aecf11555.tar.bz2 nixlib-56666959066d7f91aad61fbd64392b5aecf11555.tar.lz nixlib-56666959066d7f91aad61fbd64392b5aecf11555.tar.xz nixlib-56666959066d7f91aad61fbd64392b5aecf11555.tar.zst nixlib-56666959066d7f91aad61fbd64392b5aecf11555.zip |
Merge pull request #26417 from sifmelcara/update/pygit2
pythonPackages.pygit2: 0.25.0 -> 0.25.1
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 238e4ec6d0c3..0d0649440c29 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18663,13 +18663,24 @@ in { }; pygit2 = buildPythonPackage rec { - name = "pygit2-0.25.0"; + name = "pygit2-0.25.1"; src = pkgs.fetchurl { url = "mirror://pypi/p/pygit2/${name}.tar.gz"; - sha256 = "0wf5rp0fvrw7j3j18dvwjq6xqlbm611wd55aphrfpps0v1gxh3ny"; + sha256 = "0sja3g9mqwp5bnhdc313b2gc4z3p70nn6zzf2h8j581g0lrn0sg8"; }; + # Fixes a bug which can cause test failed when cffi==1.10 + prePatch = let + cffiVersionPatch = pkgs.fetchurl { + url = "https://github.com/libgit2/pygit2/commit/b88dc868423af2f760f649960112efd0e37e5335.patch"; + sha256 = "14cfrz56y2dnwlxrrss9pjhxfnyyg5856gbabzjzyx674k0qcid4"; + }; + in '' + # we need to delete part of the patch because the missing .travis.yml causes problem + sed -e '1,36d' ${cffiVersionPatch} | patch -p1 + ''; + preConfigure = ( if stdenv.isDarwin then '' export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib" '' else "" ); @@ -18680,6 +18691,7 @@ in { # disable tests that require networking rm test/test_repository.py rm test/test_credentials.py + rm test/test_submodule.py ''; meta = { |