public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python3Packages.pygit2: fix build

Browse Source
This commit is contained in:
Domen Kožar 2014-08-27 19:21:50 +02:00
parent e7fca7b31d
commit 1b376347f5
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/git2/default.nix
View File

@ -1,13 +1,13 @@
{stdenv, fetchurl, cmake, zlib, python}: {stdenv, fetchurl, cmake, zlib, python}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.20.0"; version = "0.21.1";
name = "libgit2-${version}"; name = "libgit2-${version}";
src = fetchurl { src = fetchurl {
name = "${name}.tar.gz"; name = "${name}.tar.gz";
url = "https://github.com/libgit2/libgit2/tarball/v${version}"; url = "https://github.com/libgit2/libgit2/tarball/v${version}";
sha256 = "1iyncz8fqazw683dxjls3lf5pw3f5ma8kachkvjz7dsq57wxllbj"; sha256 = "0afbvcsryg7bsmbfj23l09b1xngkmqhf043njl8wm44qslrxibkz";
}; };
cmakeFlags = "-DTHREADSAFE=ON"; cmakeFlags = "-DTHREADSAFE=ON";

14
pkgs/top-level/python-packages.nix
View File

@ -1492,7 +1492,7 @@ rec {
md5 = "d329f5cb2053fd31dafc02e2c9ef0299"; md5 = "d329f5cb2053fd31dafc02e2c9ef0299";
}; };
buildInputs = [ pkgs.libffi pycparser ]; propagatedBuildInputs = [ pkgs.libffi pycparser ];
meta = { meta = {
maintainers = [ stdenv.lib.maintainers.iElectric ]; maintainers = [ stdenv.lib.maintainers.iElectric ];
@ -5920,18 +5920,24 @@ rec {
pygit2 = buildPythonPackage rec { pygit2 = buildPythonPackage rec {
name = "pygit2-0.20.0"; name = "pygit2-0.21.2";
src = fetchurl { src = fetchurl {
url = "https://pypi.python.org/packages/source/p/pygit2/${name}.tar.gz"; url = "https://pypi.python.org/packages/source/p/pygit2/${name}.tar.gz";
sha256 = "04132q7bn8k7q7ky7nj3bkza8r9xkzkdpfv462b6rgjsd1x6h340"; sha256 = "0lya4v91d4y5fwrb55n8m8avgmz0l81jml2spvx6r7j1czcx3zic";
}; };
preConfigure = ( if stdenv.isDarwin then '' preConfigure = ( if stdenv.isDarwin then ''
export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib" export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib"
'' else "" ); '' else "" );
propagatedBuildInputs = [ pkgs.libgit2 ]; propagatedBuildInputs = [ pkgs.libgit2 cffi ];
preCheck = ''
# disable tests that require networking
rm test/test_repository.py
rm test/test_credentials.py
'';
meta = { meta = {
homepage = https://pypi.python.org/pypi/pygit2; homepage = https://pypi.python.org/pypi/pygit2;