summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorRobert Schütz <nix@dotlambda.de>2023-11-20 08:12:09 -0800
committerMartin Weinelt <hexa@darmstadt.ccc.de>2023-12-20 20:15:33 +0100
commit32a6949d54134bdda5ed279c914fbc6f79fdc84d (patch)
treed55924557eb4ba46e175f1fd70299bb2d919f123 /pkgs
parentfe3fca2b92cca58c0ea118c2b8e4b99afc9c46d2 (diff)
python311Packages.ocrmypdf: 15.4.0 -> 15.4.4
Diff: https://github.com/ocrmypdf/OCRmyPDF/compare/v15.4.0...v15.4.4 Changelog: https://github.com/ocrmypdf/OCRmyPDF/blob/v15.4.4/docs/release_notes.rst
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/ocrmypdf/default.nix8
-rw-r--r--pkgs/development/python-modules/ocrmypdf/paths.patch10
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix
index c6e16c25d52c..a2b185d0e963 100644
--- a/pkgs/development/python-modules/ocrmypdf/default.nix
+++ b/pkgs/development/python-modules/ocrmypdf/default.nix
@@ -31,11 +31,11 @@
buildPythonPackage rec {
pname = "ocrmypdf";
- version = "15.4.0";
+ version = "15.4.4";
disabled = pythonOlder "3.9";
- format = "pyproject";
+ pyproject = true;
src = fetchFromGitHub {
owner = "ocrmypdf";
@@ -47,10 +47,10 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
- hash = "sha256-cbKqisaRAeT8ljANbYiUDrptAoQmmIkMu1ya8O6nXvQ=";
+ hash = "sha256-Ff0OrSJFglVPpSNB0KvDMnatj+P57zWdcVAFaM+Sg0s=";
};
- SETUPTOOLS_SCM_PRETEND_VERSION = version;
+ env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
patches = [
(substituteAll {
diff --git a/pkgs/development/python-modules/ocrmypdf/paths.patch b/pkgs/development/python-modules/ocrmypdf/paths.patch
index a1db7c690bcf..1701a73215d0 100644
--- a/pkgs/development/python-modules/ocrmypdf/paths.patch
+++ b/pkgs/development/python-modules/ocrmypdf/paths.patch
@@ -1,16 +1,16 @@
diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py
-index 92b73a0a..9f04555c 100644
+index 94eec244..4bb15db9 100644
--- a/src/ocrmypdf/_exec/ghostscript.py
+++ b/src/ocrmypdf/_exec/ghostscript.py
-@@ -58,7 +58,7 @@ log.addFilter(DuplicateFilter(log))
-
-
+@@ -31,7 +31,7 @@ COLOR_CONVERSION_STRATEGIES = frozenset(
+ ]
+ )
# Ghostscript executable - gswin32c is not supported
-GS = 'gswin64c' if os.name == 'nt' else 'gs'
+GS = '@gs@'
- def version() -> Version:
+ log = logging.getLogger(__name__)
diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py
index 5a34a95a..5ee1b333 100644
--- a/src/ocrmypdf/_exec/jbig2enc.py