pythonPackage.nipype: fix build

`pythonPackages.prov` has been bumped to `1.5.2`, however `nipype`
pinned `prov` to `1.5.0`. Patching `nipype/info.py` fixes this issue by
bumping to the current `prov` version in nixpkgs.

See https://hydra.nixos.org/build/71817962/log
See ticket #36453
This commit is contained in:
Maximilian Bosch 2018-03-28 01:08:12 +02:00
parent cfd79b4d8a
commit db0fa06fce
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
2 changed files with 24 additions and 0 deletions

View File

@ -36,6 +36,9 @@ buildPythonPackage rec {
sha256 = "47f62fda3d6b9a37aa407a6b78c80e91240aa71e61191ed00da68b02839fe258";
};
# see https://github.com/nipy/nipype/issues/2240
patches = [ ./prov-version.patch ];
doCheck = false; # fails with TypeError: None is not callable
checkInputs = [ which ];
buildInputs = [ pytest mock ]; # required in installPhase

View File

@ -0,0 +1,21 @@
diff --git a/nipype/info.py b/nipype/info.py
index 1daa382e2..da338d0ea 100644
--- a/nipype/info.py
+++ b/nipype/info.py
@@ -108,7 +108,6 @@ DATEUTIL_MIN_VERSION = '2.2'
PYTEST_MIN_VERSION = '3.0'
FUTURE_MIN_VERSION = '0.16.0'
SIMPLEJSON_MIN_VERSION = '3.8.0'
-PROV_VERSION = '1.5.0'
CLICK_MIN_VERSION = '6.6.0'
PYDOT_MIN_VERSION = '1.2.3'
@@ -140,7 +139,7 @@ REQUIRES = [
'traits>=%s' % TRAITS_MIN_VERSION,
'future>=%s' % FUTURE_MIN_VERSION,
'simplejson>=%s' % SIMPLEJSON_MIN_VERSION,
- 'prov==%s' % PROV_VERSION,
+ 'prov<2',
'click>=%s' % CLICK_MIN_VERSION,
'funcsigs',
'pytest>=%s' % PYTEST_MIN_VERSION,