From 614e5f946cb8058220a7a8daf64911702afc151d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 16:53:51 -0700
Subject: [PATCH 01/22] python312Packages.opencv-python: init at 4.9.0

---
 .../python-modules/opencv-python/default.nix       | 14 ++++++++++++++
 pkgs/top-level/python-packages.nix                 |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/python-modules/opencv-python/default.nix

diff --git a/pkgs/development/python-modules/opencv-python/default.nix b/pkgs/development/python-modules/opencv-python/default.nix
new file mode 100644
index 000000000000..ee875421a96c
--- /dev/null
+++ b/pkgs/development/python-modules/opencv-python/default.nix
@@ -0,0 +1,14 @@
+{
+  mkPythonMetaPackage,
+  opencv4,
+}:
+
+mkPythonMetaPackage {
+  pname = "opencv-python";
+  inherit (opencv4) version;
+  dependencies = [ opencv4 ];
+  optional-dependencies = opencv4.optional-dependencies or { };
+  meta = {
+    inherit (opencv4.meta) description homepage;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e15b48dcb152..0da91cf7af76 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9406,6 +9406,8 @@ self: super: with self; {
     pythonPackages = self;
   });
 
+  opencv-python = callPackage ../development/python-modules/opencv-python { };
+
   opencv-python-headless = callPackage ../development/python-modules/opencv-python-headless { };
 
   openerz-api = callPackage ../development/python-modules/openerz-api { };

From 3db8bbd41abcbcfaf12f3cd12bcf6b1d5c8484c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 16:54:35 -0700
Subject: [PATCH 02/22] mokuro: use opencv-python

---
 pkgs/by-name/mo/mokuro/package.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/by-name/mo/mokuro/package.nix b/pkgs/by-name/mo/mokuro/package.nix
index 7d8d44d6c5c3..d1b14f45c289 100644
--- a/pkgs/by-name/mo/mokuro/package.nix
+++ b/pkgs/by-name/mo/mokuro/package.nix
@@ -17,12 +17,6 @@ python3Packages.buildPythonApplication rec {
     fetchSubmodules = true;
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-        --replace-fail 'opencv-python' 'opencv'
-  '';
-
-
   pythonRelaxDeps = [ "torchvision" ];
 
   build-system = with python3Packages; [ setuptools-scm ];
@@ -33,7 +27,7 @@ python3Packages.buildPythonApplication rec {
     manga-ocr
     natsort
     numpy
-    opencv4
+    opencv-python
     pillow
     pyclipper
     requests

From ca5395442f9617ad8c2ab4b633d431cb1d0e2b74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 16:56:02 -0700
Subject: [PATCH 03/22] python310Packages.paddleocr: use opencv-python

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

diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix
index 7eaebfe1069d..6cca9b459556 100644
--- a/pkgs/development/python-modules/paddleocr/default.nix
+++ b/pkgs/development/python-modules/paddleocr/default.nix
@@ -10,7 +10,7 @@
   lmdb,
   lxml,
   numpy,
-  opencv4,
+  opencv-python,
   openpyxl,
   pdf2docx,
   pillow,
@@ -58,7 +58,6 @@ buildPythonPackage {
   pythonRemoveDeps = [
     "imgaug"
     "visualdl"
-    "opencv-python"
     "opencv-contrib-python"
   ];
 
@@ -71,7 +70,7 @@ buildPythonPackage {
     lmdb
     lxml
     numpy
-    opencv4
+    opencv-python
     openpyxl
     pdf2docx
     pillow

From 83c8f23dd7b071e33dcf51819f78a2275c44fc16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 16:57:17 -0700
Subject: [PATCH 04/22] python312Packages.albucore: use opencv-python

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

diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix
index 285c643038d7..31058f42ba2b 100644
--- a/pkgs/development/python-modules/albucore/default.nix
+++ b/pkgs/development/python-modules/albucore/default.nix
@@ -6,7 +6,7 @@
   setuptools,
   pytestCheckHook,
   numpy,
-  opencv4,
+  opencv-python,
   stringzilla,
 }:
 
@@ -24,13 +24,13 @@ buildPythonPackage rec {
     hash = "sha256-GwT7Py7pKbpHxx4avj37/hRjSJXdH5uBU11nCITysVw=";
   };
 
-  pythonRemoveDeps = [ "opencv-python" ];
+  pythonRelaxDeps = [ "opencv-python" ];
 
   build-system = [ setuptools ];
 
   dependencies = [
     numpy
-    opencv4
+    opencv-python
     stringzilla
   ];
 

From ceb628a5667cfa7846db69a948af169ffc29eb97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:01:04 -0700
Subject: [PATCH 05/22] python312Packages.qudida: use opencv-python

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

diff --git a/pkgs/development/python-modules/qudida/default.nix b/pkgs/development/python-modules/qudida/default.nix
index 7e0bac314b25..6900eef961c7 100644
--- a/pkgs/development/python-modules/qudida/default.nix
+++ b/pkgs/development/python-modules/qudida/default.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   numpy,
-  opencv4,
+  opencv-python,
   pythonOlder,
   scikit-learn,
   typing-extensions,
@@ -21,12 +21,9 @@ buildPythonPackage rec {
     hash = "sha256-2xmOKIerDJqgAj5WWvv/Qd+3azYfhf1eE/eA11uhjMg=";
   };
 
-
-  pythonRemoveDeps = [ "opencv-python" ];
-
   propagatedBuildInputs = [
     numpy
-    opencv4
+    opencv-python
     scikit-learn
     typing-extensions
   ];

From 902d5e51f095b9d866d206c2dad52e70aff749c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:14:15 -0700
Subject: [PATCH 06/22] python312Packages.manim: update dependencies

---
 .../python-modules/manim/default.nix          | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix
index d96b03dfd35a..459f912d78b1 100644
--- a/pkgs/development/python-modules/manim/default.nix
+++ b/pkgs/development/python-modules/manim/default.nix
@@ -12,12 +12,8 @@
   texliveInfraOnly,
 
   click,
-  click-default-group,
   cloup,
-  colour,
-  grpcio,
-  grpcio-tools,
-  importlib-metadata,
+  decorator,
   isosurfaces,
   jupyterlab,
   manimpango,
@@ -25,6 +21,7 @@
   moderngl,
   moderngl-window,
   networkx,
+  notebook,
   numpy,
   pillow,
   pycairo,
@@ -37,6 +34,7 @@
   srt,
   svgelements,
   tqdm,
+  typing-extensions,
   watchdog,
 }:
 
@@ -188,7 +186,7 @@ buildPythonPackage rec {
     hash = "sha256-o+Wl3NMK6yopcsRVFtZuUE9c1GABa5d8rbQNHDJ4OiQ=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     poetry-core
   ];
 
@@ -209,16 +207,11 @@ buildPythonPackage rec {
 
   buildInputs = [ cairo ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     click
-    click-default-group
     cloup
-    colour
-    grpcio
-    grpcio-tools
-    importlib-metadata
+    decorator
     isosurfaces
-    jupyterlab
     manimpango
     mapbox-earcut
     moderngl
@@ -236,9 +229,19 @@ buildPythonPackage rec {
     srt
     svgelements
     tqdm
+    typing-extensions
     watchdog
   ];
 
+  optional-dependencies = {
+    jupyterlab = [
+      jupyterlab
+      notebook
+    ];
+    # TODO package dearpygui
+    # gui = [ dearpygui ];
+  };
+
   makeWrapperArgs = [
     "--prefix"
     "PATH"

From 7c2ed11f836f5d89cd8e050f1287446f5c466516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:02:54 -0700
Subject: [PATCH 07/22] python312Packages.manim-slides: use opencv-python

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

diff --git a/pkgs/development/python-modules/manim-slides/default.nix b/pkgs/development/python-modules/manim-slides/default.nix
index 9c520c0bde76..e1d349a8e848 100644
--- a/pkgs/development/python-modules/manim-slides/default.nix
+++ b/pkgs/development/python-modules/manim-slides/default.nix
@@ -15,7 +15,7 @@
   jinja2,
   lxml,
   numpy,
-  opencv4,
+  opencv-python,
   pillow,
   pydantic,
   pydantic-extra-types,
@@ -52,8 +52,6 @@ buildPythonPackage rec {
     hatch-fancy-pypi-readme
   ];
 
-  pythonRemoveDeps = [ "opencv-python" ];
-
   pythonRelaxDeps = [
     "rtoml"
     "qtpy"
@@ -67,7 +65,7 @@ buildPythonPackage rec {
       jinja2
       lxml
       numpy
-      opencv4
+      opencv-python
       pillow
       pydantic
       pydantic-extra-types

From 30732b37b7b072ddce4648048772a29c07ecf1b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:20:04 -0700
Subject: [PATCH 08/22] python310Packages.unstructured-inference: use
 opencv-python

---
 .../python-modules/unstructured-inference/default.nix    | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/unstructured-inference/default.nix b/pkgs/development/python-modules/unstructured-inference/default.nix
index 96398e97c713..b773ea48f99a 100644
--- a/pkgs/development/python-modules/unstructured-inference/default.nix
+++ b/pkgs/development/python-modules/unstructured-inference/default.nix
@@ -6,7 +6,7 @@
   layoutparser,
   python-multipart,
   huggingface-hub,
-  opencv,
+  opencv-python,
   onnxruntime,
   transformers,
   detectron2,
@@ -33,17 +33,12 @@ buildPythonPackage rec {
     hash = "sha256-2k7gFlBUevVnz2A5pvUE4eIGmXwEr5s4F8BbX6j5lzc=";
   };
 
-  postPatch = ''
-    substituteInPlace requirements/base.in \
-      --replace "opencv-python" "opencv"
-  '';
-
   propagatedBuildInputs =
     [
       layoutparser
       python-multipart
       huggingface-hub
-      opencv
+      opencv-python
       onnxruntime
       transformers
       detectron2

From ae8afe3cf4586e48c1cf80635287a49bf901bc5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:21:35 -0700
Subject: [PATCH 09/22] python311Packages.ffcv: use opencv-python

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

diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix
index 447dbb8e0f24..158050a9af77 100644
--- a/pkgs/development/python-modules/ffcv/default.nix
+++ b/pkgs/development/python-modules/ffcv/default.nix
@@ -6,7 +6,7 @@
   lib,
   libjpeg,
   numba,
-  opencv4,
+  opencv-python,
   pandas,
   pkg-config,
   pytorch-pfn-extras,
@@ -40,7 +40,6 @@ buildPythonPackage rec {
     substituteInPlace setup.py \
       --replace-fail "'assertpy'," "" \
       --replace-fail "'fastargs'," "" \
-      --replace-fail "'opencv-python'," "" \
       --replace-fail "'psutil'," "" \
   '';
 
@@ -48,7 +47,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libjpeg ];
   propagatedBuildInputs = [
-    opencv4
+    opencv-python
     numba
     pandas
     pytorch-pfn-extras

From fae4b49b037988782febb40b88e592dc15378453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:22:42 -0700
Subject: [PATCH 10/22] python312Packages.imantics: use opencv-python

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

diff --git a/pkgs/development/python-modules/imantics/default.nix b/pkgs/development/python-modules/imantics/default.nix
index 2204450bed74..9727da3837f6 100644
--- a/pkgs/development/python-modules/imantics/default.nix
+++ b/pkgs/development/python-modules/imantics/default.nix
@@ -4,7 +4,7 @@
   lib,
   setuptools,
   numpy,
-  opencv4,
+  opencv-python,
   lxml,
   xmljson,
   pytestCheckHook,
@@ -22,13 +22,11 @@ buildPythonPackage rec {
     sha256 = "1zv2gj8cbakhh2fyr2611cbqhfk37a56x973ny9n43y70n26pzm8";
   };
 
-  pythonRemoveDeps = [ "opencv-python" ];
-
   build-system = [ setuptools ];
 
   dependencies = [
     numpy
-    opencv4
+    opencv-python
     lxml
     xmljson
   ];

From a6640c450c06a2a1b6f2bfdb445708af8ff4b63b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:23:24 -0700
Subject: [PATCH 11/22] python310Packages.bpycv: use opencv-python

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

diff --git a/pkgs/development/python-modules/bpycv/default.nix b/pkgs/development/python-modules/bpycv/default.nix
index e4ad37696e25..923c4d0ced49 100644
--- a/pkgs/development/python-modules/bpycv/default.nix
+++ b/pkgs/development/python-modules/bpycv/default.nix
@@ -8,7 +8,7 @@
   fetchFromGitHub,
   fetchPypi,
   minexr,
-  opencv4,
+  opencv-python,
   requests,
   runCommand,
   zcs,
@@ -29,14 +29,10 @@ buildPythonPackage rec {
     minexr
     zcs
     requests
-    opencv4
+    opencv-python
     boxx
   ];
 
-  postPatch = ''
-    sed -i 's/opencv-python//g' requirements.txt
-  '';
-
   # pythonImportsCheck = [ "bpycv" ]; # this import depends on bpy that is only available inside blender
   doCheck = false;
 

From 542ca9b9aba714a597a08c18b815b54710ec4e81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:25:14 -0700
Subject: [PATCH 12/22] python312Packages.layoutparser: use opencv-python

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

diff --git a/pkgs/development/python-modules/layoutparser/default.nix b/pkgs/development/python-modules/layoutparser/default.nix
index 4a6c983e75ab..e6c5fcda855c 100644
--- a/pkgs/development/python-modules/layoutparser/default.nix
+++ b/pkgs/development/python-modules/layoutparser/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   # build inputs
   numpy,
-  opencv4,
+  opencv-python,
   scipy,
   pandas,
   pillow,
@@ -54,14 +54,9 @@ buildPythonPackage {
     hash = "sha256-qBzcIUmgnGy/Xn/B+7UrLrRhCvCkapL+ymqGS2sMVgA=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "opencv-python" "opencv"
-  '';
-
   propagatedBuildInputs = [
     numpy
-    opencv4
+    opencv-python
     scipy
     pandas
     pillow

From 31d63d67a3479755412432c848959b60801bb5b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:25:49 -0700
Subject: [PATCH 13/22] python311Packages.mtcnn: use opencv-python

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

diff --git a/pkgs/development/python-modules/mtcnn/default.nix b/pkgs/development/python-modules/mtcnn/default.nix
index 1c25eeab5e1f..a82f386c6e5d 100644
--- a/pkgs/development/python-modules/mtcnn/default.nix
+++ b/pkgs/development/python-modules/mtcnn/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  opencv4,
+  opencv-python,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -28,7 +28,6 @@ buildPythonPackage {
     substituteInPlace setup.py \
       --replace-fail "setup, setuptools" "setup, find_packages"\
       --replace-fail "setuptools.find_packages" "find_packages"\
-      --replace-fail "opencv-python>=4.1.0" ""\
       --replace-fail "keras>=2.0.0" ""\
       --replace-fail "tests_require=['nose']," ""
   '';
@@ -36,7 +35,7 @@ buildPythonPackage {
   build-system = [ setuptools ];
 
   dependencies = [
-    opencv4
+    opencv-python
     tensorflow
   ];
 

From c9bbb182932eee10093dc0b0d94d387d72086f47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:27:43 -0700
Subject: [PATCH 14/22] python312Packages.pdf2docx: use opencv-python-headless

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

diff --git a/pkgs/development/python-modules/pdf2docx/default.nix b/pkgs/development/python-modules/pdf2docx/default.nix
index 3e30415a54a3..b54cde4adde3 100644
--- a/pkgs/development/python-modules/pdf2docx/default.nix
+++ b/pkgs/development/python-modules/pdf2docx/default.nix
@@ -9,7 +9,7 @@
   fire,
   fonttools,
   numpy,
-  opencv4,
+  opencv-python-headless,
   tkinter,
   python-docx,
   setuptools,
@@ -34,8 +34,6 @@ buildPythonPackage {
     setuptools
   ];
 
-  pythonRemoveDeps = [ "opencv-python" ];
-
   preBuild = "echo '${version}' > version.txt";
 
   dependencies = [
@@ -43,7 +41,7 @@ buildPythonPackage {
     fire
     fonttools
     numpy
-    opencv4
+    opencv-python-headless
     python-docx
   ];
 

From 9d6fc5360ce5e317077226c984098fefa11dec48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:30:38 -0700
Subject: [PATCH 15/22] python312Packages.albumentations: use opencv-python

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

diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix
index a613b6340754..327bde178777 100644
--- a/pkgs/development/python-modules/albumentations/default.nix
+++ b/pkgs/development/python-modules/albumentations/default.nix
@@ -11,7 +11,7 @@
   albucore,
   eval-type-backport,
   numpy,
-  opencv4,
+  opencv-python,
   pydantic,
   pyyaml,
   scikit-image,
@@ -47,7 +47,7 @@ buildPythonPackage rec {
     ./dont-check-for-updates.patch
   ];
 
-  pythonRemoveDeps = [ "opencv-python" ];
+  pythonRelaxDeps = [ "opencv-python" ];
 
   build-system = [ setuptools ];
 
@@ -55,7 +55,7 @@ buildPythonPackage rec {
     albucore
     eval-type-backport
     numpy
-    opencv4
+    opencv-python
     pydantic
     pyyaml
     scikit-image

From 4f81dd4009c49dd43bd4f51657079a6b4f91375d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:36:27 -0700
Subject: [PATCH 16/22] python312Packages.videocr: use opencv-python

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

diff --git a/pkgs/development/python-modules/videocr/default.nix b/pkgs/development/python-modules/videocr/default.nix
index 262c109325d9..ed37faf4bb1f 100644
--- a/pkgs/development/python-modules/videocr/default.nix
+++ b/pkgs/development/python-modules/videocr/default.nix
@@ -5,7 +5,7 @@
   setuptools,
   levenshtein,
   pytesseract,
-  opencv4,
+  opencv-python,
   fuzzywuzzy,
 }:
 
@@ -24,14 +24,13 @@ buildPythonPackage rec {
   dependencies = [
     levenshtein
     pytesseract
-    opencv4
+    opencv-python
     fuzzywuzzy
   ];
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace-fail "python-Levenshtein" "Levenshtein" \
-      --replace-fail "opencv-python" "opencv"
+      --replace-fail "python-Levenshtein" "Levenshtein"
     substituteInPlace videocr/constants.py \
       --replace-fail "master" "main"
     substituteInPlace videocr/video.py \

From ea60f68a878bf1b74aa4e874a779ecb60ba95341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:38:42 -0700
Subject: [PATCH 17/22] mavproxy: use opencv-python

---
 pkgs/applications/science/robotics/mavproxy/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix
index 86afe4e5ffdb..bae3f747ba1a 100644
--- a/pkgs/applications/science/robotics/mavproxy/default.nix
+++ b/pkgs/applications/science/robotics/mavproxy/default.nix
@@ -5,7 +5,7 @@
 , lxml
 , matplotlib
 , numpy
-, opencv4
+, opencv-python
 , pymavlink
 , pyserial
 , setuptools
@@ -25,16 +25,11 @@ buildPythonApplication rec {
     hash = "sha256-A7tqV1kBCSuWHJUTdUZGcPY/r7X1edGZs6xDctpMbMI=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "opencv-python" ""
-  '';
-
   propagatedBuildInputs = [
     lxml
     matplotlib
     numpy
-    opencv4
+    opencv-python
     pymavlink
     pyserial
     setuptools

From e4467c1cc8beaca9ed2435ee85f7c004b846add3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:40:03 -0700
Subject: [PATCH 18/22] deface: use opencv-python

---
 pkgs/applications/video/deface/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/applications/video/deface/default.nix b/pkgs/applications/video/deface/default.nix
index 054bb04aee72..5b80ed6e2528 100644
--- a/pkgs/applications/video/deface/default.nix
+++ b/pkgs/applications/video/deface/default.nix
@@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
     numpy
     onnx
     onnxruntime # Nixpkgs onnxruntime is missing CUDA support
-    opencv4
+    opencv-python
     scikit-image
     tqdm
   ];
@@ -39,11 +39,6 @@ python3.pkgs.buildPythonApplication rec {
     ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ pkgs.onnxruntime ]}"''
   ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "opencv-python" "opencv"
-  '';
-
   pythonImportsCheck = [ "deface" "onnx" "onnxruntime" ];
 
   meta = {

From 9985ebb02b805dabfc2ea12a734e0e1434d0bb04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:41:13 -0700
Subject: [PATCH 19/22] python312Packages.rapidocr-onnxruntime: use
 opencv-python

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

diff --git a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix
index 5739ca88b3b0..49ec5f4a5b8b 100644
--- a/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix
+++ b/pkgs/development/python-modules/rapidocr-onnxruntime/default.nix
@@ -10,7 +10,7 @@
 
   setuptools,
   pyclipper,
-  opencv4,
+  opencv-python,
   numpy,
   six,
   shapely,
@@ -90,7 +90,7 @@ buildPythonPackage {
 
   dependencies = [
     pyclipper
-    opencv4
+    opencv-python
     numpy
     six
     shapely
@@ -99,9 +99,6 @@ buildPythonPackage {
     onnxruntime
   ];
 
-  # Remove because we have adopted the `opencv4` as an attribute name.
-  pythonRemoveDeps = [ "opencv-python" ];
-
   pythonImportsCheck = [ "rapidocr_onnxruntime" ];
 
   nativeCheckInputs = [ pytestCheckHook ];

From 9e03a278f95ca4e02771e6ea92bf780fdf413229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:42:28 -0700
Subject: [PATCH 20/22] python312Packages.invisible-watermark: use
 opencv-python

---
 .../python-modules/invisible-watermark/default.nix          | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/invisible-watermark/default.nix b/pkgs/development/python-modules/invisible-watermark/default.nix
index 445774979df7..d7ad922cf538 100644
--- a/pkgs/development/python-modules/invisible-watermark/default.nix
+++ b/pkgs/development/python-modules/invisible-watermark/default.nix
@@ -4,7 +4,7 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  opencv4,
+  opencv-python,
   torch,
   onnx,
   onnxruntime,
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs =
     [
-      opencv4
+      opencv-python
       torch
       pillow
       pywavelets
@@ -42,8 +42,6 @@ buildPythonPackage rec {
     ];
 
   postPatch = ''
-    substituteInPlace setup.py \
-      --replace 'opencv-python>=4.1.0.25' 'opencv'
     substituteInPlace imwatermark/rivaGan.py --replace \
       'You can install it with pip: `pip install onnxruntime`.' \
       'You can install it with an override: `python3Packages.invisible-watermark.override { withOnnx = true; };`.'

From 6ed4e0393eb8e42fb33b30742d3119346f315228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:44:19 -0700
Subject: [PATCH 21/22] python312Packages.grad-cam: use opencv-python

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

diff --git a/pkgs/development/python-modules/grad-cam/default.nix b/pkgs/development/python-modules/grad-cam/default.nix
index 3700043f8eea..09c3473a2038 100644
--- a/pkgs/development/python-modules/grad-cam/default.nix
+++ b/pkgs/development/python-modules/grad-cam/default.nix
@@ -6,7 +6,7 @@
   setuptools,
   matplotlib,
   numpy,
-  opencv4,
+  opencv-python,
   pillow,
   scikit-learn,
   torch,
@@ -27,11 +27,6 @@ buildPythonPackage rec {
     hash = "sha256-q9PcG836Az+2o1XqeKNh0+z9GN9UGinmGyOAhD5B3Zw=";
   };
 
-  postPatch = ''
-    substituteInPlace requirements.txt\
-      --replace "opencv-python" "opencv"
-  '';
-
   nativeBuildInputs = [
   ];
 
@@ -46,7 +41,7 @@ buildPythonPackage rec {
   dependencies = [
     matplotlib
     numpy
-    opencv4
+    opencv-python
     pillow
     scikit-learn
     torchvision

From 1be0b8ceee9af915697ae6d6424ebb3a72931c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 2 Nov 2024 17:44:49 -0700
Subject: [PATCH 22/22] python312Packages.imagecorruptions: use opencv-python

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

diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix
index fa92484160e1..280770b8a63e 100644
--- a/pkgs/development/python-modules/imagecorruptions/default.nix
+++ b/pkgs/development/python-modules/imagecorruptions/default.nix
@@ -5,7 +5,7 @@
   numpy,
   scikit-image,
   lib,
-  opencv4,
+  opencv-python,
 }:
 
 buildPythonPackage rec {
@@ -18,14 +18,12 @@ buildPythonPackage rec {
     sha256 = "044e173f24d5934899bdbf3596bfbec917e8083e507eed583ab217abebbe084d";
   };
 
-  pythonRemoveDeps = [ "opencv-python" ];
-
   build-system = [ setuptools ];
 
   dependencies = [
     numpy
     scikit-image
-    opencv4
+    opencv-python
   ];
 
   doCheck = false;