Merge pull request #181358 from SuperSandro2000/libgit2
libgit2: 1.4.3 -> 1.5.0
This commit is contained in:
commit
6d0e6cd049
2 changed files with 12 additions and 2 deletions
|
@ -15,14 +15,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgit2";
|
||||
version = "1.4.3";
|
||||
version = "1.5.0";
|
||||
# also check the following packages for updates: python3.pkgs.pygit2 and libgit2-glib
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libgit2";
|
||||
repo = "libgit2";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WnRzH5uMVEStA5ns4GNgMD5YoLQoats9aPLfnz9RoQs=";
|
||||
sha256 = "sha256-lXFQo+tt56BFoPgdkTfz6WdIngeotTm+8cAGcBP6XqY=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
, cacert
|
||||
, cached-property
|
||||
, cffi
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, isPyPy
|
||||
, libgit2
|
||||
|
@ -24,6 +25,15 @@ buildPythonPackage rec {
|
|||
hash = "sha256-IIlEM98RRkgarK434rDzu7/eoCbbL1UGEXC9mCPkCxk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# libgit 2 fix
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libgit2/pygit2/commit/14b1df84060ea4ab085202382e80672ec1a104e3.patch";
|
||||
includes = [ "src/types.h" ];
|
||||
sha256 = "sha256-2krkyAT30l/olSEl2ugWCsylvGuT7VvkuSFVshIXktA=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
export DYLD_LIBRARY_PATH="${libgit2}/lib"
|
||||
'';
|
||||
|
|
Loading…
Reference in a new issue