diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/pillow/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/pillow/default.nix | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/nixpkgs/pkgs/development/python-modules/pillow/default.nix index 4e8a47569b7e..cc9a77be7827 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -1,32 +1,37 @@ { stdenv, buildPythonPackage, fetchPypi, isPyPy , olefile , freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 -, pytestrunner -, pytest +, openjpeg, libimagequant +, pyroma, numpy, pytestCheckHook +, isPy3k }: + buildPythonPackage rec { pname = "Pillow"; - version = "6.2.2"; + version = "7.1.2"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "db9ff0c251ed066d367f53b64827cc9e18ccea001b986d08c265e53625dab950"; + sha256 = "1pdh1zzdwxilvsjg6rnl4q810pc2p2y16q6lx9gzzihb25h9kd50"; }; - doCheck = !stdenv.isDarwin && !isPyPy; - # Disable imagefont tests, because they don't work well with infinality: # https://github.com/python-pillow/Pillow/issues/1259 postPatch = '' rm Tests/test_imagefont.py ''; + # Disable darwin tests which require executables: `iconutil` and `screencapture` + disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_save" "test_grab" "test_grabclipboard" ]; + propagatedBuildInputs = [ olefile ]; - checkInputs = [ pytest pytestrunner ]; + checkInputs = [ pytestCheckHook pyroma numpy ]; buildInputs = [ - freetype libjpeg zlib libtiff libwebp tcl lcms2 ] + freetype libjpeg openjpeg libimagequant 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. @@ -45,6 +50,8 @@ buildPythonPackage rec { sed -i "setup.py" \ -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ; s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ; + s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ; + s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ; s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ; s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ; s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ; @@ -61,8 +68,8 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = "https://python-pillow.github.io/"; - description = "Fork of The Python Imaging Library (PIL)"; + homepage = "https://python-pillow.org/"; + description = "The friendly PIL fork (Python Imaging Library)"; longDescription = '' The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library |