From 34902c088f117bd7911d57ce1da467a9f466b9b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Sep 2026 11:05:09 +0000
Subject: [PATCH 1/2] python3Packages.pyvips: 3.1.1 -> 3.2.0

---
 pkgs/development/python-modules/pyvips/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix
index 05bafe72ba92..ac2be8c139f1 100644
--- a/pkgs/development/python-modules/pyvips/default.nix
+++ b/pkgs/development/python-modules/pyvips/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "pyvips";
-  version = "3.1.1";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "libvips";
     repo = "pyvips";
     tag = "v${version}";
-    hash = "sha256-BPQFndikPSsKU4HPauTAewab32IumckG/y3lhUUNbMU=";
+    hash = "sha256-N98UR6WC9ICQyBuAVejR8yrzZEBaE92EO7jY65SnaKg=";
   };
 
   nativeBuildInputs = [

From 84d635a8e0f9dbe5b2f7e9f16fc9b6ddb75ebcae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 28 Sep 2026 21:08:18 +0200
Subject: [PATCH 2/2] python3Packages.pyvips: modernize

- migrate to finalAttrs
- update ordering
---
 .../python-modules/pyvips/default.nix         | 42 +++++++++----------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix
index ac2be8c139f1..28f6558e306a 100644
--- a/pkgs/development/python-modules/pyvips/default.nix
+++ b/pkgs/development/python-modules/pyvips/default.nix
@@ -12,7 +12,7 @@
   vips,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyvips";
   version = "3.2.0";
   pyproject = true;
@@ -20,24 +20,30 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "libvips";
     repo = "pyvips";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-N98UR6WC9ICQyBuAVejR8yrzZEBaE92EO7jY65SnaKg=";
   };
 
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [
-    glib
-    vips
-  ];
+  postPatch = ''
+    substituteInPlace pyvips/__init__.py \
+      --replace 'libvips.so.42' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \
+      --replace 'libvips.42.dylib' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \
+      --replace 'libgobject-2.0.so.0' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}' \
+      --replace 'libgobject-2.0.dylib' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}'
+  '';
 
   build-system = [
     pkgconfig
     setuptools
   ];
 
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    glib
+    vips
+  ];
+
   dependencies = [ cffi ];
 
   env = lib.optionalAttrs stdenv.cc.isClang {
@@ -46,14 +52,6 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  postPatch = ''
-    substituteInPlace pyvips/__init__.py \
-      --replace 'libvips.so.42' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \
-      --replace 'libvips.42.dylib' '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}' \
-      --replace 'libgobject-2.0.so.0' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}' \
-      --replace 'libgobject-2.0.dylib' '${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}'
-  '';
-
   disabledTests = [
     # flaky due to a race condition
     # https://github.com/libvips/pyvips/issues/566
@@ -69,10 +67,8 @@ buildPythonPackage rec {
   meta = {
     description = "Python wrapper for libvips";
     homepage = "https://github.com/libvips/pyvips";
-    changelog = "https://github.com/libvips/pyvips/blob/v${version}/CHANGELOG.rst";
+    changelog = "https://github.com/libvips/pyvips/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      anthonyroussel
-    ];
+    maintainers = with lib.maintainers; [ anthonyroussel ];
   };
-}
+})