From 605b2c9cb672c9c6dfd007381746ac8280bdb2f7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 2 Apr 2025 05:08:08 +0200
Subject: [PATCH] python313Packages.pillow: 11.1.0 -> 11.2.0

https://pillow.readthedocs.io/en/stable/releasenotes/11.2.0.html
---
 .../python-modules/pillow/default.nix          | 18 ++++++++++++++----
 pkgs/top-level/python-packages.nix             |  3 ++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index 4384c6ad2f27..a87a959ef116 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -12,6 +12,7 @@
   # native dependencies
   freetype,
   lcms2,
+  libavif,
   libimagequant,
   libjpeg,
   libraqm,
@@ -20,7 +21,7 @@
   libxcb,
   openjpeg,
   tkinter,
-  zlib,
+  zlib-ng,
 
   # optional dependencies
   defusedxml,
@@ -43,14 +44,14 @@
 
 buildPythonPackage rec {
   pname = "pillow";
-  version = "11.1.0";
+  version = "11.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-pillow";
     repo = "pillow";
     tag = version;
-    hash = "sha256-9tcukZIJMheVNBfpppjUcuhvRal7J59iQWgBqkEgJDk=";
+    hash = "sha256-gr6S0FTM/VMnqj35E9U5G3BJ203f0XQzgzYCQ81WL/Y=";
   };
 
   build-system = [ setuptools ];
@@ -61,6 +62,7 @@ buildPythonPackage rec {
   buildInputs = [
     freetype
     lcms2
+    libavif
     libimagequant
     libjpeg
     libraqm
@@ -69,7 +71,7 @@ buildPythonPackage rec {
     libxcb
     openjpeg
     tkinter
-    zlib
+    zlib-ng
   ];
 
   pypaBuildFlags = [
@@ -84,6 +86,7 @@ buildPythonPackage rec {
     ''
       # The build process fails to find the pkg-config files for these dependencies
       substituteInPlace setup.py \
+        --replace-fail 'AVIF_ROOT = None' 'AVIF_ROOT = ${getLibAndInclude libavif}' \
         --replace-fail 'IMAGEQUANT_ROOT = None' 'IMAGEQUANT_ROOT = ${getLibAndInclude libimagequant}' \
         --replace-fail 'JPEG2K_ROOT = None' 'JPEG2K_ROOT = ${getLibAndInclude openjpeg}'
 
@@ -105,6 +108,13 @@ buildPythonPackage rec {
     numpy
   ] ++ lib.flatten (lib.attrValues optional-dependencies);
 
+  pytestFlagsArray = [
+    # AssertionError:  average pixel value difference 12.0968 > epsilon 11.5000
+    "--deselect=Tests/test_file_avif.py::TestFileAvif::test_read"
+    # AssertionError:  average pixel value difference 8.0108 > epsilon 6.0200
+    "--deselect=Tests/test_file_avif.py::TestFileAvif::test_write_rgb"
+  ];
+
   disabledTests =
     [
       # Code quality mismathch 9 vs 10
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 44b6fb941762..c4e1be2ad781 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10956,13 +10956,14 @@ self: super: with self; {
     inherit (pkgs)
       freetype
       lcms2
+      libavif
       libimagequant
       libjpeg
       libraqm
       libtiff
       libwebp
       openjpeg
-      zlib
+      zlib-ng
       ;
     inherit (pkgs.xorg) libxcb;
   };