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

Merge pull request #9788 from desiderius/pillow-2.9.0

Browse Source 
pythonPackages.pillow: 2.3.0 -> 2.9.0
This commit is contained in:
lethalman 2015-09-18 15:17:32 +02:00
commit ef9a50b0a6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/top-level/python-packages.nix
View File

@ -10321,15 +10321,19 @@ let
pillow = buildPythonPackage rec { pillow = buildPythonPackage rec {
name = "Pillow-2.3.0"; name = "Pillow-2.9.0";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://pypi.python.org/packages/source/P/Pillow/${name}.zip"; url = "http://pypi.python.org/packages/source/P/Pillow/${name}.zip";
md5 = "56b6614499aacb7d6b5983c4914daea7"; sha256 = "1mal92cwh85z6zqx7lrmg0dbqb2gw2cbb2fm6xh0fivmszz8vnyi";
}; };
# Check is disabled because of assertion errors, see
# https://github.com/python-pillow/Pillow/issues/1259
doCheck = false;
buildInputs = with self; [ buildInputs = with self; [
pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl ] pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl nose ]
++ optionals (isPy26 || isPy27 || isPy33 || isPyPy) [ pkgs.lcms2 ] ++ optionals (isPy26 || isPy27 || isPy33 || isPyPy) [ pkgs.lcms2 ]
++ optionals (isPyPy) [ pkgs.tk pkgs.xlibs.libX11 ]; ++ optionals (isPyPy) [ pkgs.tk pkgs.xlibs.libX11 ];