Merge pull request #227227 from r-ryantm/auto-update/libgit2
This commit is contained in:
@@ -19,14 +19,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgit2";
|
||||
version = "1.6.3";
|
||||
version = "1.6.4";
|
||||
# also check the following packages for updates: python3Packages.pygit2 and libgit2-glib
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libgit2";
|
||||
repo = "libgit2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MiEw5UbmcPfW0SlqLdYEnBdOp29YIVdKXE588uUjqck=";
|
||||
hash = "sha256-lW3mokVKsbknVj2xsxEbeZH4IdKZ0aIgGutzenS0Eh0=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
, cffi
|
||||
, fetchPypi
|
||||
, isPyPy
|
||||
, libgit2_1_5
|
||||
, libgit2
|
||||
, pycparser
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
@@ -14,22 +14,22 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygit2";
|
||||
version = "1.11.1";
|
||||
version = "1.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-eT9YP9M2IPCsODdtsPV3aO8pIribRZ51saxEA3frZOw=";
|
||||
hash = "sha256-6UQNCGZeNSeJiZOVkKU/N6k46tpPlEaESTCqLuMNc74=";
|
||||
};
|
||||
|
||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
export DYLD_LIBRARY_PATH="${libgit2_1_5}/lib"
|
||||
export DYLD_LIBRARY_PATH="${libgit2}/lib"
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
libgit2_1_5
|
||||
libgit2
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
Reference in New Issue
Block a user