public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pythonPackages.pillow: 8.2.0 -> 8.3.0

Browse Source 
add support for defusedxml

(cherry picked from commit e202771a892e8d2156bed2ec1c085dbeeda6faa1)
This commit is contained in:
Evan Stoll 2021-07-01 23:37:44 -04:00 committed by github-actions[bot]
parent 4cdb9a0cc3
commit c40e9cc00a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/pillow/default.nix
View File

@ -1,17 +1,17 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k { lib, stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy3k
, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11 , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, tcl, lcms2, tk, libX11
, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook , libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook
}@args: }@args:
import ./generic.nix (rec { import ./generic.nix (rec {
pname = "Pillow"; pname = "Pillow";
version = "8.2.0"; version = "8.3.0";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1qf3bz1sfz58ff6hclg8phgqyy210x3aqdk5yzjr8m5vsw8ap1x7"; sha256 = "0ikwwh8lx08rag1yjkfhf33zlk67vas7l7kblkp6dqzk0vi0cdl0";
}; };
meta = with lib; { meta = with lib; {

3
pkgs/development/python-modules/pillow/generic.nix
View File

@ -31,7 +31,8 @@ buildPythonPackage rec {
"test_custom_metadata" "test_custom_metadata"
]; ];
propagatedBuildInputs = [ olefile ]; propagatedBuildInputs = [ olefile ]
++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ];
checkInputs = [ pytestCheckHook pyroma numpy ]; checkInputs = [ pytestCheckHook pyroma numpy ];