From 2af4c082a8049670e5f98918cf1bfded127e8b10 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 7 Nov 2025 23:03:41 +0100
Subject: [PATCH 1/3] opencv: update contrib and test data

This was missed during the 4.12 update and didn't stand out while testing
the update.
---
 pkgs/development/libraries/opencv/4.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index f3a264cf2644..45462686311b 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -121,14 +121,14 @@ let
     owner = "opencv";
     repo = "opencv_contrib";
     tag = version;
-    hash = "sha256-YNd96qFJ8SHBgDEEsoNps888myGZdELbbuYCae9pW3M=";
+    hash = "sha256-3tbscRFryjCynIqh0OWec8CUjXTeIDxOGJkHTK2aIao=";
   };
 
   testDataSrc = fetchFromGitHub {
     owner = "opencv";
     repo = "opencv_extra";
     tag = version;
-    hash = "sha256-EqlGlemztYlk03MX1LAviArWT+OA3/qL3jfgHYC+SP8=";
+    hash = "sha256-f8PZyFLdfixt1ApjMc9Cvj9nfEaDRUszSeEfCsWziis=";
   };
 
   # Contrib must be built in order to enable Tesseract support:

From edec19b63d47cc92913ee6aad7e293535ed8be4f Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 10 Nov 2025 11:23:17 -0800
Subject: [PATCH 2/3] opencv.tests: add big-parallel to requiredSystemFeatures

---
 pkgs/development/libraries/opencv/tests.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opencv/tests.nix b/pkgs/development/libraries/opencv/tests.nix
index 2d0fb46c2861..4499b72aa31e 100644
--- a/pkgs/development/libraries/opencv/tests.nix
+++ b/pkgs/development/libraries/opencv/tests.nix
@@ -83,7 +83,7 @@ runCommand "opencv4-tests"
 
     testRunner = optionalString (!isDarwin) "${getExe xvfb-run} -a ";
 
-    requiredSystemFeatures = optionals cudaSupport [ "cuda" ];
+    requiredSystemFeatures = [ "big-parallel" ] ++ optionals cudaSupport [ "cuda" ];
   }
   ''
     set -euo pipefail

From 742317f130e775ecb49be4f810fd22bf9c0ab5b2 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 10 Nov 2025 11:23:17 -0800
Subject: [PATCH 3/3] opencv.tests: disable calib3d due to excessive runtime

---
 pkgs/development/libraries/opencv/tests.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opencv/tests.nix b/pkgs/development/libraries/opencv/tests.nix
index 4499b72aa31e..e6d3d88f65f3 100644
--- a/pkgs/development/libraries/opencv/tests.nix
+++ b/pkgs/development/libraries/opencv/tests.nix
@@ -49,7 +49,7 @@ runCommand "opencv4-tests"
     inherit runAccuracyTests;
 
     accuracyTestNames = [
-      "calib3d"
+      # "calib3d" # reached a month of CPU time without completing
       "core"
       "features2d"
       "flann"
@@ -69,7 +69,7 @@ runCommand "opencv4-tests"
     inherit runPerformanceTests;
 
     performanceTestNames = [
-      "calib3d"
+      # "calib3d" # reached a month of CPU time without completing
       "core"
       "features2d"
       "imgcodecs"