From 0d3d10da4b2b5d3bfaa45236fb838e15cab5911b Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 28 Dec 2025 12:08:02 -0800
Subject: [PATCH 1/3] python3Packages.pyvips: disable flaky test due to a race
 condition

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

diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix
index fa87da354fab..5f03e35f6bb8 100644
--- a/pkgs/development/python-modules/pyvips/default.nix
+++ b/pkgs/development/python-modules/pyvips/default.nix
@@ -57,6 +57,12 @@ buildPythonPackage rec {
       --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
+    "test_progress"
+  ];
+
   pythonImportsCheck = [ "pyvips" ];
 
   meta = {

From ca36574faa0f68dd132acabe128457ae726360f6 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 28 Dec 2025 12:09:40 -0800
Subject: [PATCH 2/3] python3Packages.pyvips: skip performance benchmarking

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

diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix
index 5f03e35f6bb8..8bc7e45bbefa 100644
--- a/pkgs/development/python-modules/pyvips/default.nix
+++ b/pkgs/development/python-modules/pyvips/default.nix
@@ -63,6 +63,10 @@ buildPythonPackage rec {
     "test_progress"
   ];
 
+  disabledTestPaths = [
+    "tests/perf"
+  ];
+
   pythonImportsCheck = [ "pyvips" ];
 
   meta = {

From 82c359e4900c7719241545c9bcce0b091b4befe8 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 28 Dec 2025 12:11:22 -0800
Subject: [PATCH 3/3] python3Packages.pyvips: 3.0.0 -> 3.1.1

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

diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix
index 8bc7e45bbefa..28cf124edf86 100644
--- a/pkgs/development/python-modules/pyvips/default.nix
+++ b/pkgs/development/python-modules/pyvips/default.nix
@@ -8,23 +8,20 @@
   pkg-config, # from pkgs
   pkgconfig, # from pythonPackages
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   vips,
 }:
 
 buildPythonPackage rec {
   pname = "pyvips";
-  version = "3.0.0";
+  version = "3.1.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "libvips";
     repo = "pyvips";
     tag = "v${version}";
-    hash = "sha256-dyous0EahUR7pkr2siBBJwzcoC4TOsnsbRo+rVE8/QQ=";
+    hash = "sha256-BPQFndikPSsKU4HPauTAewab32IumckG/y3lhUUNbMU=";
   };
 
   nativeBuildInputs = [