nilearn: 0.2.5 -> 0.3.1

fixes #29178
NixOS · Sep 15, 2017 · f8f62d5 · f8f62d5
1 parent dd170cd
commit f8f62d5
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 30 deletions.
diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, buildPythonPackage, fetchPypi, nose, nibabel, numpy, scikitlearn
+, scipy, matplotlib }:
+
+buildPythonPackage rec {
+  pname = "nilearn";
+  version = "0.3.1";
+  name = "nilearn-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0kkarh5cdcd2czs0bf0s1g51qas84mfxfq0dzd7k5h5l0qr4zy06";
+  };
+
+  checkPhase = "nosetests --exclude with_expand_user nilearn/tests";
+
+  buildInputs = [ nose ];
+
+  propagatedBuildInputs = [
+    matplotlib
+    nibabel
+    numpy
+    scikitlearn
+    scipy
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://nilearn.github.io;
+    description = "A module for statistical learning on neuroimaging data";
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -13190,36 +13190,7 @@ in {
     };
   };
 
-  nilearn = buildPythonPackage rec {
-    version = "0.2.5";
-    name = "nilearn-${version}";
-
-    # package seems to attempt Python 3 compatibility, but throws UnicodeDecodeError when building:
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/nilearn/${name}.tar.gz";
-      sha256 = "1lmkrzr5x2yp129v2fvckrbdzf2kpcivdg9cacl519l3mb0acdv9";
-    };
-
-    checkPhase = "nosetests --exclude with_expand_user nilearn/tests";
-
-    buildInputs = with self; [ nose ];
-
-    propagatedBuildInputs = with self; [
-      matplotlib
-      nibabel
-      numpy
-      scikitlearn
-      scipy
-    ];
-
-    meta = {
-      homepage = http://nilearn.github.io;
-      description = "A module for statistical learning on neuroimaging data";
-      license = licenses.bsd3;
-    };
-  };
+  nilearn = callPackage ../development/python-modules/nilearn {};
 
   nipy = buildPythonPackage rec {
     version = "0.4.0";