From 2f416c0e6899c95b889cea16b6382b038ed0b14c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 19 Aug 2023 21:56:53 +0100
Subject: [PATCH] python3Packages.pillow: pull zlib-1.3 fix pending upstream
 inclusion

Without the change tests fails against `zlib-1.3` as:

        def test_sanity(self, tmp_path):
            # internal version number
    >       assert re.search(r"\d+\.\d+\.\d+(\.\d+)?$", features.version_codec("zlib"))
    E       AssertionError: assert None
    E        +  where None = <function search at 0x7ffff74c5c60>('\\d+\\.\\d+\\.\\d+(\\.\\d+)?$', '1.3')
    E        +    where <function search at 0x7ffff74c5c60> = re.search
    E        +    and   '1.3' = <function version_codec at 0x7ffff6896680>('zlib')
    E        +      where <function version_codec at 0x7ffff6896680> = features.version_codec
    Tests/test_file_png.py:82: AssertionError
---
 pkgs/development/python-modules/pillow/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index f1489e1f458d..bb669f421177 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -24,6 +24,16 @@ import ./generic.nix (rec {
     hash = "sha256-nIK1s+BDx68NlXktDSDM9o9hof7Gs1MOcYtohCJyc5Y=";
   };
 
+  patches = [
+    # Pull in zlib-1.3 fix pending upstream inclusion
+    #   https://github.com/python-pillow/Pillow/pull/7344
+    (fetchpatch {
+      name = "zlib-1.3.patch";
+      url = "https://github.com/python-pillow/Pillow/commit/9ef7cb39def45b0fe1cdf4828ca20838a1fc39d1.patch";
+      hash = "sha256-N7V6Xz+SBHSm3YIgmbty7zbqkv8MzpLMhU4Xxerhx8w=";
+    })
+  ];
+
   passthru.tests = {
     inherit imageio matplotlib pilkit pydicom reportlab;
   };