From d958c3095853e4d49a896dd63ac66a8ebbed4c9f Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Wed, 12 Jan 2022 19:52:48 +0000
Subject: [PATCH 1/2] python3Packages.pillow: 8.4.0 -> 9.0.0

---
 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 e0f29d366e10..57b085a54051 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; {

From e0951f8c03468b5ba1cebc385fe10b92fccbfc01 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Wed, 12 Jan 2022 22:08:03 +0000
Subject: [PATCH 2/2] python3Packages.imageio: 2.13.2 -> 2.13.5

include patch to fix behaviour with pillow 9
---
 .../development/python-modules/imageio/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index 0a97a27d17f8..5727b52755a6 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