diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-16 20:28:10 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-16 20:28:10 +0100 |
| commit | 7aedd744d8a933d278429072a5edebbacdaa8a76 (patch) | |
| tree | b6f365a754f103ffaf7cbfd7c1b97ed4ea4c74d7 /pkgs/development/python-modules/nipype | |
| parent | 49b3d9ae6299079b074f195b3de068790052ea0f (diff) | |
| parent | 3ad650a14b0477a0df2795abe185c66849a5012d (diff) | |
| download | nixpkgs-7aedd744d8a933d278429072a5edebbacdaa8a76.tar nixpkgs-7aedd744d8a933d278429072a5edebbacdaa8a76.tar.gz nixpkgs-7aedd744d8a933d278429072a5edebbacdaa8a76.tar.bz2 nixpkgs-7aedd744d8a933d278429072a5edebbacdaa8a76.tar.lz nixpkgs-7aedd744d8a933d278429072a5edebbacdaa8a76.tar.xz nixpkgs-7aedd744d8a933d278429072a5edebbacdaa8a76.tar.zst nixpkgs-7aedd744d8a933d278429072a5edebbacdaa8a76.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/python-modules/nipype')
| -rw-r--r-- | pkgs/development/python-modules/nipype/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 4d80a0638c7..13c35999cf9 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -6,6 +6,8 @@ , click , configparser ? null , dateutil +, etelemetry +, filelock , funcsigs , future , futures @@ -14,6 +16,7 @@ , nibabel , numpy , packaging +, pathlib2 , prov , psutil , pybids @@ -60,6 +63,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ click dateutil + etelemetry + filelock funcsigs future networkx @@ -77,6 +82,7 @@ buildPythonPackage rec { ] ++ stdenv.lib.optional (!isPy3k) [ configparser futures + pathlib2 # darwin doesn't receive this transitively, but it is in install_requires ]; checkInputs = [ @@ -91,6 +97,8 @@ buildPythonPackage rec { which ]; + # checks on darwin inspect memory which doesn't work in build environment + doCheck = !stdenv.isDarwin; # ignore tests which incorrect fail to detect xvfb checkPhase = '' LC_ALL="en_US.UTF-8" pytest -v nipype -k 'not display' |