From 02697fa8ac0967025f2615d9aa86f43d11b9e408 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jun 2023 23:11:07 +0200
Subject: [PATCH 1/3] python311Packages.easyocr: add changelog to meta

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

diff --git a/pkgs/development/python-modules/easyocr/default.nix b/pkgs/development/python-modules/easyocr/default.nix
index c94a0647ba40..4fd0c4de8eab 100644
--- a/pkgs/development/python-modules/easyocr/default.nix
+++ b/pkgs/development/python-modules/easyocr/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "JaidedAI";
     repo = "EasyOCR";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-f+JBSnFMRvVlhRRiL1rJb7a0CNjZPuh6r8r3K1meQCk=";
   };
 
@@ -55,6 +55,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Ready-to-use OCR with 80+ supported languages and all popular writing scripts";
     homepage = "https://github.com/JaidedAI/EasyOCR";
+    changelog = "https://github.com/JaidedAI/EasyOCR/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ dit7ya ];
   };

From 2613f870fbcb62e25cf936e294faa13e580154dc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jun 2023 23:13:04 +0200
Subject: [PATCH 2/3] python311Packages.easyocr: add format

- disable on unsupported Python releases
---
 .../python-modules/easyocr/default.nix        | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/easyocr/default.nix b/pkgs/development/python-modules/easyocr/default.nix
index 4fd0c4de8eab..d086ea7c643c 100644
--- a/pkgs/development/python-modules/easyocr/default.nix
+++ b/pkgs/development/python-modules/easyocr/default.nix
@@ -3,22 +3,26 @@
 , fetchFromGitHub
 , hdf5
 , numpy
+, onnx
 , opencv3
 , pillow
 , pyaml
 , pyclipper
 , python-bidi
-, torch
+, pythonOlder
 , scikit-image
 , scipy
 , shapely
+, torch
 , torchvision
-, onnx
 }:
 
 buildPythonPackage rec {
   pname = "easyocr";
   version = "1.6.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "JaidedAI";
@@ -34,23 +38,27 @@ buildPythonPackage rec {
   '';
 
   propagatedBuildInputs = [
-    scikit-image
     hdf5
-    python-bidi
     numpy
     opencv3
-    torchvision
     pillow
     pyaml
     pyclipper
-    torch
+    python-bidi
+    scikit-image
     scipy
     shapely
+    torch
+    torchvision
   ];
 
-  nativeCheckInputs = [ onnx ];
+  nativeCheckInputs = [
+    onnx
+  ];
 
-  pythonImportsCheck = [ "easyocr" ];
+  pythonImportsCheck = [
+    "easyocr"
+  ];
 
   meta = with lib; {
     description = "Ready-to-use OCR with 80+ supported languages and all popular writing scripts";

From 2163573a469f374efaa460b7e4a48121a7d3782f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 9 Jun 2023 23:17:42 +0200
Subject: [PATCH 3/3] python310Packages.easyocr: 1.6.2 -> 1.7.0

Diff: https://github.com/JaidedAI/EasyOCR/compare/refs/tags/v1.6.2...v1.7.0

Changelog: https://github.com/JaidedAI/EasyOCR/releases/tag/v1.7.0
---
 pkgs/development/python-modules/easyocr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/easyocr/default.nix b/pkgs/development/python-modules/easyocr/default.nix
index d086ea7c643c..3d260f1f652f 100644
--- a/pkgs/development/python-modules/easyocr/default.nix
+++ b/pkgs/development/python-modules/easyocr/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "easyocr";
-  version = "1.6.2";
+  version = "1.7.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -28,12 +28,12 @@ buildPythonPackage rec {
     owner = "JaidedAI";
     repo = "EasyOCR";
     rev = "refs/tags/v${version}";
-    hash = "sha256-f+JBSnFMRvVlhRRiL1rJb7a0CNjZPuh6r8r3K1meQCk=";
+    hash = "sha256-01Exz55eTIO/xzdq/dzV+ELkU75hpxe/EbjIqLBA8h0=";
   };
 
   postPatch = ''
     substituteInPlace requirements.txt \
-      --replace "opencv-python-headless<=4.5.4.60" "" \
+      --replace "opencv-python-headless" "" \
       --replace "ninja" ""
   '';