about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2019-12-26 20:14:48 +0100
committerMaximilian Bosch <maximilian@mbosch.me>2019-12-26 20:16:16 +0100
commitb43892e7674140ee0c44a8551e79fa3e21a26860 (patch)
tree82429b3a44bf1b01b34867eb3ab63bfb223eda26
parent6f802abc13961203c1615f13b2e1a50cb287c54b (diff)
downloadnixlib-b43892e7674140ee0c44a8551e79fa3e21a26860.tar
nixlib-b43892e7674140ee0c44a8551e79fa3e21a26860.tar.gz
nixlib-b43892e7674140ee0c44a8551e79fa3e21a26860.tar.bz2
nixlib-b43892e7674140ee0c44a8551e79fa3e21a26860.tar.lz
nixlib-b43892e7674140ee0c44a8551e79fa3e21a26860.tar.xz
nixlib-b43892e7674140ee0c44a8551e79fa3e21a26860.tar.zst
nixlib-b43892e7674140ee0c44a8551e79fa3e21a26860.zip
python3Packages.pytesseract: 0.3.0 -> 0.3.1
https://github.com/madmaze/pytesseract/releases/tag/v0.3.1
-rw-r--r--pkgs/development/python-modules/pytesseract/default.nix6
-rw-r--r--pkgs/development/python-modules/pytesseract/tesseract-binary.patch14
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix
index 0f10ed601f76..b6d45980e537 100644
--- a/pkgs/development/python-modules/pytesseract/default.nix
+++ b/pkgs/development/python-modules/pytesseract/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pytesseract";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n9vasm5fp25fmr9ns9i3bf4kri63s1mvmjgc6q8w7rx840ww7df";
+    sha256 = "1j7d4aa6v1nd3pd1vrfmkv8mbmw0x78cjfpkq3nxpy1r4hj5nwq3";
   };
 
   patches = [
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     homepage = https://pypi.org/project/pytesseract/;
-    license = licenses.gpl3;
+    license = licenses.asl20;
     description = "A Python wrapper for Google Tesseract";
     maintainers = with maintainers; [ ma27 ];
   };
diff --git a/pkgs/development/python-modules/pytesseract/tesseract-binary.patch b/pkgs/development/python-modules/pytesseract/tesseract-binary.patch
index f7eb9fb1d42a..27b042bbaa52 100644
--- a/pkgs/development/python-modules/pytesseract/tesseract-binary.patch
+++ b/pkgs/development/python-modules/pytesseract/tesseract-binary.patch
@@ -1,13 +1,13 @@
 diff --git a/src/pytesseract.py b/src/pytesseract.py
-index 32713cf..5f9209d 100755
+index 132f59b..f161e5c 100755
 --- a/src/pytesseract.py
 +++ b/src/pytesseract.py
-@@ -25,7 +25,7 @@ if numpy_installed:
-     from numpy import ndarray
+@@ -23,7 +23,7 @@ except ImportError:
+     import Image
+ 
  
- # CHANGE THIS IF TESSERACT IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY
 -tesseract_cmd = 'tesseract'
 +tesseract_cmd = '@drv@/bin/tesseract'
- RGB_MODE = 'RGB'
- OSD_KEYS = {
-     'Page number': ('page_num', int),
+ 
+ numpy_installed = find_loader('numpy') is not None
+ if numpy_installed: