From e202771a892e8d2156bed2ec1c085dbeeda6faa1 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Thu, 1 Jul 2021 23:37:44 -0400 Subject: [PATCH 1/2] pythonPackages.pillow: 8.2.0 -> 8.3.0 add support for defusedxml --- pkgs/development/python-modules/pillow/default.nix | 6 +++--- pkgs/development/python-modules/pillow/generic.nix | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 0f747a8d73e0..ea568aff6a8c 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -1,17 +1,17 @@ { 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 }@args: import ./generic.nix (rec { pname = "Pillow"; - version = "8.2.0"; + version = "8.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1qf3bz1sfz58ff6hclg8phgqyy210x3aqdk5yzjr8m5vsw8ap1x7"; + sha256 = "0ikwwh8lx08rag1yjkfhf33zlk67vas7l7kblkp6dqzk0vi0cdl0"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix index 64ae91895593..3e33f1a8aa0f 100644 --- a/pkgs/development/python-modules/pillow/generic.nix +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -31,7 +31,8 @@ buildPythonPackage rec { "test_custom_metadata" ]; - propagatedBuildInputs = [ olefile ]; + propagatedBuildInputs = [ olefile ] + ++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ]; checkInputs = [ pytestCheckHook pyroma numpy ]; From 6635489576e4ef70a819d6dd8a355977841ecf64 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 6 Jul 2021 04:20:00 +0000 Subject: [PATCH 2/2] python38Packages.pillow: 8.3.0 -> 8.3.1 https://pillow.readthedocs.io/en/stable/releasenotes/8.3.1.html --- 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 ea568aff6a8c..af6c3d80deaf 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -5,13 +5,13 @@ import ./generic.nix (rec { pname = "Pillow"; - version = "8.3.0"; + version = "8.3.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0ikwwh8lx08rag1yjkfhf33zlk67vas7l7kblkp6dqzk0vi0cdl0"; + sha256 = "2cac53839bfc5cece8fdbe7f084d5e3ee61e1303cccc86511d351adcb9e2c792"; }; meta = with lib; {