diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2018-03-28 01:08:12 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2018-03-30 18:45:04 +0200 |
| commit | db0fa06fce8adc85e49a0ffcf0f0bad85220ff89 (patch) | |
| tree | eef1c875c178a414530018d6eac4b8f30b711070 | |
| parent | cfd79b4d8a525fe875d77bc7dfd2267000a634b0 (diff) | |
| download | nixlib-db0fa06fce8adc85e49a0ffcf0f0bad85220ff89.tar nixlib-db0fa06fce8adc85e49a0ffcf0f0bad85220ff89.tar.gz nixlib-db0fa06fce8adc85e49a0ffcf0f0bad85220ff89.tar.bz2 nixlib-db0fa06fce8adc85e49a0ffcf0f0bad85220ff89.tar.lz nixlib-db0fa06fce8adc85e49a0ffcf0f0bad85220ff89.tar.xz nixlib-db0fa06fce8adc85e49a0ffcf0f0bad85220ff89.tar.zst nixlib-db0fa06fce8adc85e49a0ffcf0f0bad85220ff89.zip | |
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
| -rw-r--r-- | pkgs/development/python-modules/nipype/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/python-modules/nipype/prov-version.patch | 21 |
2 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 30ee2b28561a..2ea6a10a5533 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -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 diff --git a/pkgs/development/python-modules/nipype/prov-version.patch b/pkgs/development/python-modules/nipype/prov-version.patch new file mode 100644 index 000000000000..133295d0560b --- /dev/null +++ b/pkgs/development/python-modules/nipype/prov-version.patch @@ -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, |