python.pkgs.scikitimage: move expression

pkgs/development/python-modules/scikit-image/default.nix

@@ -0,0 +1,36 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, cython
+, dask
+, nose
+, numpy
+, scipy
+, six
+, pillow
+, matplotlib
+, networkx
+}:
+
+buildPythonPackage rec {
+  pname = "scikit-image";
+  version = "0.12.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1iypjww5hk46i9vzg2zlfc9w4vdw029cfyakkkl02isj1qpiknl2";
+  };
+
+  buildInputs = [ cython dask nose ];
+
+  propagatedBuildInputs = [ pillow matplotlib networkx scipy six numpy ];
+
+  # the test fails because the loader cannot create test objects!
+  doCheck = false;
+
+  meta = {
+    description = "Image processing routines for SciPy";
+    homepage = http://scikit-image.org;
+    license = lib.licenses.bsd3;
+  };
+}

pkgs/top-level/python-packages.nix

@@ -12437,28 +12437,7 @@ in {
 
   scipy = callPackage ../development/python-modules/scipy { };
 
-  scikitimage = buildPythonPackage rec {
+  scikitimage = callPackage ../development/python-modules/scikit-image { };
-    name = "scikit-image-${version}";
-    version = "0.12.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/scikit-image/${name}.tar.gz";
-      sha256 = "1iypjww5hk46i9vzg2zlfc9w4vdw029cfyakkkl02isj1qpiknl2";
-    };
-
-    buildInputs = with self; [ cython dask nose numpy scipy six ];
-
-    propagatedBuildInputs = with self; [ pillow matplotlib networkx scipy six numpy ];
-
-    # the test fails because the loader cannot create test objects!
-    doCheck = false;
-
-    meta = {
-      description = "Image processing routines for SciPy";
-      homepage = http://scikit-image.org;
-      license = licenses.bsd3;
-    };
-  };
 
   scikitlearn = callPackage ../development/python-modules/scikitlearn {
     inherit (pkgs) gfortran glibcLocales;