From 5b11e8d4be0d0f71b5203c118b424688f910415d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 6 Jun 2020 04:20:00 -0500 Subject: [PATCH 1/2] python37Packages.pillow: fix build on darwin --- pkgs/development/python-modules/pillow/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 2f9fac6c3d1..bd7a9b0e61b 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -2,7 +2,7 @@ , olefile , freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 , openjpeg, libimagequant -, pytest, pytestrunner, pyroma, numpy +, pyroma, numpy, pytestCheckHook , isPy3k }: @@ -23,15 +23,12 @@ buildPythonPackage rec { rm Tests/test_imagefont.py ''; - checkPhase = '' - runHook preCheck - python -m pytest -v -x -W always - runHook postCheck - ''; + # 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 pyroma numpy ]; + checkInputs = [ pytestCheckHook pyroma numpy ]; buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ] From 98d74faa1783ff1f192730f63f2157d5d05119a8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 6 Jun 2020 04:21:00 -0500 Subject: [PATCH 2/2] python37Packages.pillow: update metadata --- pkgs/development/python-modules/pillow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index bd7a9b0e61b..cc9a77be782 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -68,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