diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-01-13 13:41:09 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-01-29 01:27:09 +0100 |
| commit | 76b70d0c4676ed1ccccd173727ac7c8203141442 (patch) | |
| tree | 769be7db8c6d20dfec6876de488a816f5cb1fb6e | |
| parent | d7a004f4b5a3882c97f3b1e2d2a9f8971d5f70b8 (diff) | |
| download | nixpkgs-76b70d0c4676ed1ccccd173727ac7c8203141442.tar nixpkgs-76b70d0c4676ed1ccccd173727ac7c8203141442.tar.gz nixpkgs-76b70d0c4676ed1ccccd173727ac7c8203141442.tar.bz2 nixpkgs-76b70d0c4676ed1ccccd173727ac7c8203141442.tar.lz nixpkgs-76b70d0c4676ed1ccccd173727ac7c8203141442.tar.xz nixpkgs-76b70d0c4676ed1ccccd173727ac7c8203141442.tar.zst nixpkgs-76b70d0c4676ed1ccccd173727ac7c8203141442.zip | |
Merge #154825: python3Packages.{pillow,imageio}: security updates
(cherry picked from commit d6374a376b78fc0fecdcacb5ee8616981d503a0c)
| -rw-r--r-- | pkgs/development/python-modules/imageio/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pillow/default.nix | 4 |
2 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 0a97a27d17f..5727b52755a 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy27 , fetchPypi +, fetchpatch , imageio-ffmpeg , numpy , pillow @@ -12,14 +13,23 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.13.2"; + version = "2.13.5"; disabled = isPy27; src = fetchPypi { - sha256 = "5b7a55d07de88a2fd70f18a1608ca05ba2b55596a942fb2c390240201009a6c3"; + sha256 = "0gc41aiz2i0napk1y00v9bgb4m7dd21sz3lghfm6w6s0ivjjpv67"; inherit pname version; }; + patches = [ + # already present in master, remove on next bump + (fetchpatch { + name = "pillow-9-gif-rgba.patch"; + url = "https://github.com/imageio/imageio/commit/836b7a9b077a96de8adab5b67ea53b1292048275.patch"; + sha256 = "0rlyppa4w16n6qn5hr4wrg8xiy7ifs8c5dhmq8a9yncypx87glpv"; + }) + ]; + propagatedBuildInputs = [ imageio-ffmpeg numpy diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index e0f29d366e1..57b085a5405 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.4.0"; + version = "9.0.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed"; + sha256 = "0gjry0yqryd2678sm47jhdnbghzxn5wk8pgyaqwr4qi7x5ijjvpf"; }; meta = with lib; { |