nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-09 06:23:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #128936 from evanjs/pythonPackages/pillow/8.3.0

Browse Source
This commit is contained in:
Martin Weinelt 2021-07-10 04:31:54 +02:00 committed by GitHub
commit c56ff33b5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
, 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.1";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "1qf3bz1sfz58ff6hclg8phgqyy210x3aqdk5yzjr8m5vsw8ap1x7";
sha256 = "2cac53839bfc5cece8fdbe7f084d5e3ee61e1303cccc86511d351adcb9e2c792";
};
meta = with lib; {

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

@ -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 ];