diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-07 09:00:52 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-07 09:47:13 +0100 |
| commit | 56b429c252429c42c20fb6c01cf05679f01aed86 (patch) | |
| tree | 0b60b755866734cba0003941ab7ca9bb958aaf53 /pkgs/development/python-modules/pillow | |
| parent | 881d6a9e646e41adc1d7a8a72b39afa53bdaeb3c (diff) | |
| download | nixpkgs-56b429c252429c42c20fb6c01cf05679f01aed86.tar nixpkgs-56b429c252429c42c20fb6c01cf05679f01aed86.tar.gz nixpkgs-56b429c252429c42c20fb6c01cf05679f01aed86.tar.bz2 nixpkgs-56b429c252429c42c20fb6c01cf05679f01aed86.tar.lz nixpkgs-56b429c252429c42c20fb6c01cf05679f01aed86.tar.xz nixpkgs-56b429c252429c42c20fb6c01cf05679f01aed86.tar.zst nixpkgs-56b429c252429c42c20fb6c01cf05679f01aed86.zip | |
python: Pillow: 4.3.0 -> 5.0.0
Diffstat (limited to 'pkgs/development/python-modules/pillow')
| -rw-r--r-- | pkgs/development/python-modules/pillow/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 4be9c911f71..03474825527 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -1,14 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPyPy, - nose, olefile, - freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11}: +{ stdenv, buildPythonPackage, fetchPypi, isPyPy +, olefile +, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 +, pytestrunner +, pytest +}: buildPythonPackage rec { pname = "Pillow"; - version = "4.3.0"; + version = "5.0.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "a97c715d44efd5b4aa8d739b8fad88b93ed79f1b33fc2822d5802043f3b1b527"; + sha256 = "12f29d6c23424f704c66b5b68c02fe0b571504459605cfe36ab8158359b0e1bb"; }; doCheck = !stdenv.isDarwin && !isPyPy; @@ -21,8 +24,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ olefile ]; + checkInputs = [ pytest pytestrunner ]; + buildInputs = [ - freetype libjpeg zlib libtiff libwebp tcl nose lcms2 ] + freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ stdenv.lib.optionals (isPyPy) [ tk libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. |