summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorChris Ostrouchov <chris.ostrouchov@gmail.com>2018-10-16 17:18:40 -0400
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2018-10-18 11:02:23 +0200
commitf725650c69cec41cf7044d88aaf3efad04bb787b (patch)
tree768458b9b4edf345a6774f0a3fb33a5846d6033b /pkgs
parent65db7eb208f623f1952954897ca643adf8890a92 (diff)
downloadnixlib-f725650c69cec41cf7044d88aaf3efad04bb787b.tar
nixlib-f725650c69cec41cf7044d88aaf3efad04bb787b.tar.gz
nixlib-f725650c69cec41cf7044d88aaf3efad04bb787b.tar.bz2
nixlib-f725650c69cec41cf7044d88aaf3efad04bb787b.tar.lz
nixlib-f725650c69cec41cf7044d88aaf3efad04bb787b.tar.xz
nixlib-f725650c69cec41cf7044d88aaf3efad04bb787b.tar.zst
nixlib-f725650c69cec41cf7044d88aaf3efad04bb787b.zip
pythonPackages.imageio: refactor move to python-modules
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/imageio/default.nix33
-rw-r--r--pkgs/top-level/python-packages.nix26
2 files changed, 34 insertions, 25 deletions
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
new file mode 100644
index 000000000000..cdbcfee7180f
--- /dev/null
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, buildPythonPackage
+, fetchurl
+, pytest
+, numpy
+}:
+
+buildPythonPackage rec {
+  pname = "imageio";
+  version = "1.6";
+
+  src = fetchurl {
+    url = "https://github.com/imageio/imageio/archive/v${version}.tar.gz";
+    sha256 = "195snkk3fsbjqd5g1cfsd9alzs5q45gdbi2ka9ph4yxqb31ijrbv";
+  };
+
+  buildInputs = [ pytest ];
+  propagatedBuildInputs = [ numpy ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  # Tries to write in /var/tmp/.imageio
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats";
+    homepage = http://imageio.github.io/;
+    license = licenses.bsd2;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2ae3efdbcd06..be2465ca657a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2476,31 +2476,7 @@ in {
 
   icalendar = callPackage ../development/python-modules/icalendar { };
 
-  imageio = buildPythonPackage rec {
-    name = "imageio-${version}";
-    version = "1.6";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/imageio/imageio/archive/v${version}.tar.gz";
-      sha256 = "195snkk3fsbjqd5g1cfsd9alzs5q45gdbi2ka9ph4yxqb31ijrbv";
-    };
-
-    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [ numpy ];
-
-    checkPhase = ''
-      py.test
-    '';
-
-    # Tries to write in /var/tmp/.imageio
-    doCheck = false;
-
-    meta = {
-      description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats";
-      homepage = http://imageio.github.io/;
-      license = licenses.bsd2;
-    };
-  };
+  imageio = callPackage ../development/python-modules/imageio { };
 
   imgaug = callPackage ../development/python-modules/imgaug { };