diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-01-12 01:00:12 +0000 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-01-12 01:00:12 +0000 |
| commit | eeaf5d25d5f6ae7ae1f5bf8a3dee4559693f8147 (patch) | |
| tree | afc41ca8dde96b41089ca324533084aef570322f /nixpkgs/pkgs/development/python-modules/nipype | |
| parent | 63c4c4dda49dc69e5812faa7ef8406180998f3ae (diff) | |
| parent | e4134747f5666bcab8680aff67fa3b63384f9a0f (diff) | |
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/nipype')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/nipype/default.nix | 14 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/nipype/neurdflib.nix | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/nixpkgs/pkgs/development/python-modules/nipype/default.nix index 4d80a0638c7..ab81b2b190b 100644 --- a/nixpkgs/pkgs/development/python-modules/nipype/default.nix +++ b/nixpkgs/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 @@ -45,11 +48,11 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.2.3"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "a79c7a72897d81985d20a8c805465285400b59a45ddc527cda44026795fd1c47"; + sha256 = "bb190964b568d64b04b73d2aa7eae31061fdbc3051d8c27bb34b1632db07ec71"; }; postPatch = '' @@ -60,6 +63,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ click dateutil + etelemetry + filelock funcsigs future networkx @@ -74,9 +79,10 @@ buildPythonPackage rec { simplejson traits xvfbwrapper - ] ++ stdenv.lib.optional (!isPy3k) [ + ] ++ stdenv.lib.optionals (!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' diff --git a/nixpkgs/pkgs/development/python-modules/nipype/neurdflib.nix b/nixpkgs/pkgs/development/python-modules/nipype/neurdflib.nix index 3042f715687..33526bebd55 100644 --- a/nixpkgs/pkgs/development/python-modules/nipype/neurdflib.nix +++ b/nixpkgs/pkgs/development/python-modules/nipype/neurdflib.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "neurdflib"; - version = "5.0.0.post1"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1qgmprixqxycxpjk9wjdmjykma14qqa2wcbx4nsldxi0ga7i7vv5"; + sha256 = "d34493cee15029ff5db16157429585ff863ba5542675a4d8a94a0da1bc6e3a50"; }; propagatedBuildInputs = [ isodate html5lib SPARQLWrapper ]; |