diff options
| author | adisbladis <adisbladis@gmail.com> | 2020-06-07 00:44:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-07 00:44:23 +0200 |
| commit | 243cfc5769afa9f2935f88fc8328389c16314f42 (patch) | |
| tree | 519dc1346652af35abbe712e44831083ca688bf3 /pkgs/top-level | |
| parent | c5acf2738ead2360611d81bba0a49442ceea3c9b (diff) | |
| parent | 7abf70b244b7a0d599729a6ae2222b81cb861704 (diff) | |
| download | nixlib-243cfc5769afa9f2935f88fc8328389c16314f42.tar nixlib-243cfc5769afa9f2935f88fc8328389c16314f42.tar.gz nixlib-243cfc5769afa9f2935f88fc8328389c16314f42.tar.bz2 nixlib-243cfc5769afa9f2935f88fc8328389c16314f42.tar.lz nixlib-243cfc5769afa9f2935f88fc8328389c16314f42.tar.xz nixlib-243cfc5769afa9f2935f88fc8328389c16314f42.tar.zst nixlib-243cfc5769afa9f2935f88fc8328389c16314f42.zip | |
Merge pull request #89588 from jonringer/freeze-piillow-py2
python2Packages.pillow: freeze at 6.2.2
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00960b457252..8a376a5abcbb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5086,9 +5086,14 @@ in { pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; - pillow = callPackage ../development/python-modules/pillow { - inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11; + pillow = if isPy27 then + callPackage ../development/python-modules/pillow/6.nix { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11; + } else + callPackage ../development/python-modules/pillow { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11; }; pkgconfig = callPackage ../development/python-modules/pkgconfig { |