diff options
author | Robert Schütz <github@dotlambda.de> | 2023-11-24 22:41:02 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-24 22:41:02 -0800 |
commit | e705fd12d20a6e2ec97d8a94ffd8886dd90a8954 (patch) | |
tree | cb888eec059f68278782cbb74880e8e168bdcb3a /pkgs | |
parent | adc533894c3257c990ba605147ed1a8e835f5f23 (diff) |
Revert "python311Packages.pikepdf: 8.4.0 -> 8.7.1"
Diffstat (limited to 'pkgs')
4 files changed, 25 insertions, 27 deletions
diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 751e2072a29af..c6e16c25d52c2 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "15.4.3"; + version = "15.4.0"; disabled = pythonOlder "3.9"; @@ -47,7 +47,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-mMop5BpODzorRgvGbpHCR80uKYT/CE2VEX8RF4Dh1hw="; + hash = "sha256-cbKqisaRAeT8ljANbYiUDrptAoQmmIkMu1ya8O6nXvQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/ocrmypdf/paths.patch b/pkgs/development/python-modules/ocrmypdf/paths.patch index 1701a73215d0e..a1db7c690bcfa 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 94eec244..4bb15db9 100644 +index 92b73a0a..9f04555c 100644 --- a/src/ocrmypdf/_exec/ghostscript.py +++ b/src/ocrmypdf/_exec/ghostscript.py -@@ -31,7 +31,7 @@ COLOR_CONVERSION_STRATEGIES = frozenset( - ] - ) +@@ -58,7 +58,7 @@ log.addFilter(DuplicateFilter(log)) + + # Ghostscript executable - gswin32c is not supported -GS = 'gswin64c' if os.name == 'nt' else 'gs' +GS = '@gs@' - log = logging.getLogger(__name__) + def version() -> Version: diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py index 5a34a95a..5ee1b333 100644 --- a/src/ocrmypdf/_exec/jbig2enc.py diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index a9b445a5f9ff4..0891ad28ec3f9 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -5,10 +5,9 @@ , hypothesis , pythonOlder , jbig2dec -, deprecated +, deprecation , lxml , mupdf -, numpy , packaging , pillow , psutil @@ -25,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "8.7.1"; + version = "8.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-uAx3Egz/woJINpruDaZOyuAlbIZUMv93VNaFHLmUjCY="; + hash = "sha256-48tb5bhmBdKVjMld07303qIi5C16yaf+5TpRPVC6EQk="; }; patches = [ @@ -69,7 +68,6 @@ buildPythonPackage rec { nativeCheckInputs = [ attrs hypothesis - numpy pytest-xdist psutil pytestCheckHook @@ -78,7 +76,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - deprecated + deprecation lxml packaging pillow diff --git a/pkgs/development/python-modules/pikepdf/paths.patch b/pkgs/development/python-modules/pikepdf/paths.patch index c9c61176aa6f4..43e472f5598ac 100644 --- a/pkgs/development/python-modules/pikepdf/paths.patch +++ b/pkgs/development/python-modules/pikepdf/paths.patch @@ -1,8 +1,8 @@ diff --git a/src/pikepdf/_methods.py b/src/pikepdf/_methods.py -index d27c660..6796984 100644 +index 2a170c6..5ee3ba1 100644 --- a/src/pikepdf/_methods.py +++ b/src/pikepdf/_methods.py -@@ -72,7 +72,7 @@ def _mudraw(buffer, fmt) -> bytes: +@@ -80,7 +80,7 @@ def _mudraw(buffer, fmt) -> bytes: tmp_in.flush() proc = run( @@ -12,22 +12,22 @@ index d27c660..6796984 100644 check=True, ) diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py -index f89b4f9..f187ebd 100644 +index 28c596b..aff3565 100644 --- a/src/pikepdf/jbig2.py +++ b/src/pikepdf/jbig2.py -@@ -63,7 +63,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): - output_path = Path(tmpdir) / "outfile" - - args = [ -- "jbig2dec", -+ "@jbig2dec@", - "--embedded", - "--format", - "png", -@@ -90,7 +90,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): +@@ -28,7 +28,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes: + output_path = Path(tmpdir) / "outfile" + + args = [ +- "jbig2dec", ++ "@jbig2dec@", + "--embedded", + "--format", + "png", +@@ -88,7 +88,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): def _version(self) -> Version: try: - proc = self._run( + proc = run( - ['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii' + ['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii' ) |