diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-20 07:18:04 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-20 07:48:38 +0200 |
commit | 9146271578a7ca0f7cabcb4ec04af6e98e7132b5 (patch) | |
tree | b408a09bc8439b81ddb405483f6b44bcf8084bb2 | |
parent | 7fdba7c74ed2887f0cce09f2cb1a0c88c51d0417 (diff) |
python.pkgs.scikitimage: move expression
-rw-r--r-- | pkgs/development/python-modules/scikit-image/default.nix | 36 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 23 |
2 files changed, 37 insertions, 22 deletions
diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix new file mode 100644 index 0000000000000..da7918ebe2d65 --- /dev/null +++ b/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; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5697feb54033..14fe614841f71 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12437,28 +12437,7 @@ in { scipy = callPackage ../development/python-modules/scipy { }; - scikitimage = buildPythonPackage rec { - 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; - }; - }; + scikitimage = callPackage ../development/python-modules/scikit-image { }; scikitlearn = callPackage ../development/python-modules/scikitlearn { inherit (pkgs) gfortran glibcLocales; |