python312Packages.ocrmypdf: 16.5.0 -> 16.6.2 (#352270)

NixOS · Nov 25, 2024 · d225878 · d225878
2 parents d328c0c + 8b81bdd
commit d225878
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch2
 , buildNpmPackage
 , nixosTests
 , gettext
@@ -141,6 +142,14 @@ python.pkgs.buildPythonApplication rec {
 
   inherit version src;
 
+  patches = [
+    (fetchpatch2 {
+      name = "ocrmypdf-16.6-compat.patch";
+      url = "https://github.com/paperless-ngx/paperless-ngx/commit/d1f255a22ea53712cb9101277ec57ea1976f9c02.patch?full_index=1";
+      hash = "sha256-V2nnNeNCcfSrjOttQ5rgDj7gnxpfpBPVeDDnMea0C3U=";
+    })
+  ];
+
   postPatch = ''
     # pytest-xdist makes the tests flaky
     substituteInPlace src/setup.cfg \

diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix
@@ -29,7 +29,7 @@
 
 buildPythonPackage rec {
   pname = "ocrmypdf";
-  version = "16.5.0";
+  version = "16.6.2";
 
   disabled = pythonOlder "3.10";
 
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm "$out/.git_archival.txt"
     '';
-    hash = "sha256-jqe4BRW0U7gqcf+FtDWjDDvRStAqaEPTuU+B+BrFR5Y=";
+    hash = "sha256-065PeCsNfAvZTLyWz3toTrE/e944mzfuwRQvKXxdnd0=";
   };
 
   patches = [

diff --git a/pkgs/development/python-modules/ocrmypdf/paths.patch b/pkgs/development/python-modules/ocrmypdf/paths.patch
@@ -96,15 +96,15 @@ index 102bdab8..bfef4400 100644
          args.extend(['-l', '+'.join(langs)])
      if engine_mode is not None:
 diff --git a/src/ocrmypdf/_exec/unpaper.py b/src/ocrmypdf/_exec/unpaper.py
-index d1165c46..7c732b15 100644
+index a5a92f4c..6cf56eb3 100644
 --- a/src/ocrmypdf/_exec/unpaper.py
 +++ b/src/ocrmypdf/_exec/unpaper.py
 @@ -48,7 +48,7 @@ class UnpaperImageTooLargeError(Exception):
 
 
  def version() -> Version:
--    return Version(get_version('unpaper'))
-+    return Version(get_version('@unpaper@'))
+-    return Version(get_version('unpaper', regex=r'(?m).*?(\d+(\.\d+)(\.\d+)?)'))
++    return Version(get_version('@unpaper@', regex=r'(?m).*?(\d+(\.\d+)(\.\d+)?)'))
 
 
  @contextmanager