Skip to content

Commit

Permalink
pythonPackage.nipype: fix build
Browse files Browse the repository at this point in the history
`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

(cherry picked from commit db0fa06)
  • Loading branch information
Ma27 authored and Robert Schütz committed Mar 31, 2018
1 parent 97afec4 commit a7c0fdb
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
3 changes: 3 additions & 0 deletions pkgs/development/python-modules/nipype/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ buildPythonPackage rec {
sha256 = "4c14c6cae1f530f89d76fa8136d52488b1daf3a02179da65121b76eaf4a6f0ea";
};

# 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
Expand Down
21 changes: 21 additions & 0 deletions pkgs/development/python-modules/nipype/prov-version.patch
Original file line number Diff line number Diff line change
@@ -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,

0 comments on commit a7c0fdb

Please sign in to comment.