python2Packages.pillow: remove
This commit is contained in:
parent
b64c0b1a12
commit
76320a7d94
|
@ -1,47 +0,0 @@
|
||||||
{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k
|
|
||||||
, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11
|
|
||||||
, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook
|
|
||||||
}@args:
|
|
||||||
|
|
||||||
import ./generic.nix (rec {
|
|
||||||
pname = "Pillow";
|
|
||||||
version = "6.2.2";
|
|
||||||
|
|
||||||
disabled = !isPy3k;
|
|
||||||
|
|
||||||
src = fetchPypi {
|
|
||||||
inherit pname version;
|
|
||||||
sha256 = "0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv";
|
|
||||||
};
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
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
|
|
||||||
supports many file formats, and provides powerful image
|
|
||||||
processing and graphics capabilities.
|
|
||||||
'';
|
|
||||||
license = "http://www.pythonware.com/products/pil/license.htm";
|
|
||||||
maintainers = with maintainers; [ goibhniu prikhi SuperSandro2000 ];
|
|
||||||
knownVulnerabilities = [
|
|
||||||
"CVE-2020-10177"
|
|
||||||
"CVE-2020-10378"
|
|
||||||
"CVE-2020-10379"
|
|
||||||
"CVE-2020-10994"
|
|
||||||
"CVE-2020-11538"
|
|
||||||
"CVE-2020-35653"
|
|
||||||
"CVE-2020-35654"
|
|
||||||
"CVE-2020-35655"
|
|
||||||
"CVE-2021-25289"
|
|
||||||
"CVE-2021-25290"
|
|
||||||
"CVE-2021-25291"
|
|
||||||
"CVE-2021-25292"
|
|
||||||
"CVE-2021-25293"
|
|
||||||
"CVE-2021-27921"
|
|
||||||
"CVE-2021-27922"
|
|
||||||
"CVE-2021-27923"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
} // args )
|
|
|
@ -1,77 +0,0 @@
|
||||||
{ pname
|
|
||||||
, version
|
|
||||||
, disabled
|
|
||||||
, src
|
|
||||||
, meta
|
|
||||||
, ...
|
|
||||||
}@args:
|
|
||||||
|
|
||||||
with args;
|
|
||||||
|
|
||||||
buildPythonPackage rec {
|
|
||||||
inherit pname version src meta;
|
|
||||||
|
|
||||||
# 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 = lib.optionals stdenv.isDarwin [
|
|
||||||
"test_grab"
|
|
||||||
"test_grabclipboard"
|
|
||||||
"test_save"
|
|
||||||
|
|
||||||
# pillow-simd
|
|
||||||
"test_roundtrip"
|
|
||||||
"test_basic"
|
|
||||||
] ++ lib.optionals (lib.versions.major version == "6") [
|
|
||||||
# RuntimeError: Error setting from dictionary
|
|
||||||
"test_custom_metadata"
|
|
||||||
];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [ olefile ]
|
|
||||||
++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ];
|
|
||||||
|
|
||||||
checkInputs = [ pytestCheckHook pyroma numpy ];
|
|
||||||
|
|
||||||
buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ]
|
|
||||||
++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ]
|
|
||||||
++ lib.optionals (isPyPy) [ tk libX11 ];
|
|
||||||
|
|
||||||
# NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
|
|
||||||
# NOTE: The Pillow install script will, by default, add paths like /usr/lib
|
|
||||||
# and /usr/include to the search paths. This can break things when building
|
|
||||||
# on a non-NixOS system that has some libraries installed that are not
|
|
||||||
# installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't
|
|
||||||
# build Pillow with this support). We patch the `disable_platform_guessing`
|
|
||||||
# setting here, instead of passing the `--disable-platform-guessing`
|
|
||||||
# command-line option, since the command-line option doesn't work when we run
|
|
||||||
# tests.
|
|
||||||
preConfigure = let
|
|
||||||
libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"'';
|
|
||||||
libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"'';
|
|
||||||
in ''
|
|
||||||
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 ;
|
|
||||||
s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ;
|
|
||||||
s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;'
|
|
||||||
export LDFLAGS="$LDFLAGS -L${libwebp}/lib"
|
|
||||||
export CFLAGS="$CFLAGS -I${libwebp}/include"
|
|
||||||
'' + lib.optionalString (lib.versionAtLeast version "7.1.0") ''
|
|
||||||
export LDFLAGS="$LDFLAGS -L${libxcb}/lib"
|
|
||||||
export CFLAGS="$CFLAGS -I${libxcb.dev}/include"
|
|
||||||
'' + lib.optionalString stdenv.isDarwin ''
|
|
||||||
# Remove impurities
|
|
||||||
substituteInPlace setup.py \
|
|
||||||
--replace '"/Library/Frameworks",' "" \
|
|
||||||
--replace '"/System/Library/Frameworks"' ""
|
|
||||||
'';
|
|
||||||
}
|
|
|
@ -57,11 +57,6 @@ with self; with super; {
|
||||||
|
|
||||||
packaging = callPackage ../development/python2-modules/packaging { };
|
packaging = callPackage ../development/python2-modules/packaging { };
|
||||||
|
|
||||||
pillow = callPackage ../development/python2-modules/pillow {
|
|
||||||
inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk;
|
|
||||||
inherit (pkgs.xorg) libX11;
|
|
||||||
};
|
|
||||||
|
|
||||||
pip = callPackage ../development/python2-modules/pip { };
|
pip = callPackage ../development/python2-modules/pip { };
|
||||||
|
|
||||||
pluggy = callPackage ../development/python2-modules/pluggy { };
|
pluggy = callPackage ../development/python2-modules/pluggy { };
|
||||||
|
|
Loading…
Reference in a new issue