From 4b1e12c5b7d9eefda56ab507d9741051c790a362 Mon Sep 17 00:00:00 2001
From: Luis Pedro Coelho <luis@luispedro.org>
Date: Mon, 6 May 2019 05:13:44 +0200
Subject: [PATCH] pythonPackages.imread: 0.6 -> 0.7.0
Mostly trivial update of version and hashes, but also explicitly use the
right dependencies
---
.../python-modules/imread/default.nix | 22 ++++++++++++-------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix
index d65010732ca5..0711283a1b83 100644
--- a/pkgs/development/python-modules/imread/default.nix
+++ b/pkgs/development/python-modules/imread/default.nix
@@ -1,22 +1,28 @@
{ stdenv
, buildPythonPackage
-, fetchurl
+, fetchPypi
, nose
-, pkgs
+, pkgconfig
+, libjpeg
+, libpng
+, libtiff
+, libwebp
, numpy
}:
buildPythonPackage rec {
pname = "python-imread";
- version = "0.6";
+ version = "0.7.0";
- src = pkgs.fetchurl {
- url = "https://github.com/luispedro/imread/archive/release-${version}.tar.gz";
- sha256 = "0i14bc67200zhzxc41g5dfp2m0pr1zaa2gv59p2va1xw0ji2dc0f";
+ src = fetchPypi {
+ inherit version;
+ pname = "imread";
+ sha256 = "0yb0fmy6ilh5fvbk69wl2bzqgss2g0951668mx8z9yyj4jhr1z2y";
};
- nativeBuildInputs = [ pkgs.pkgconfig ];
- buildInputs = [ nose pkgs.libjpeg pkgs.libpng pkgs.libtiff pkgs.libwebp ];
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ nose libjpeg libpng libtiff libwebp ];
propagatedBuildInputs = [ numpy ];
meta = with stdenv.lib; {