diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 4ba20f5aef31..788c195d5d61 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -20,12 +20,11 @@ , qpdf , setuptools , substituteAll -, wheel }: buildPythonPackage rec { pname = "pikepdf"; - version = "8.9.0"; + version = "8.11.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,14 +39,14 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-ia+D0OeB/MQWRniYkBEWZsDCwEApYGgu0++I/HupK6w="; + hash = "sha256-mxUXXD7/ERC6mfmLLo+zdsVblIplrlcnzTNQ7YUk3Q4="; }; patches = [ (substituteAll { src = ./paths.patch; - jbig2dec = "${lib.getBin jbig2dec}/bin/jbig2dec"; - mudraw = "${lib.getBin mupdf}/bin/mudraw"; + jbig2dec = lib.getExe' jbig2dec "jbig2dec"; + mutool = lib.getExe' mupdf "mutool"; }) ]; @@ -63,7 +62,6 @@ buildPythonPackage rec { nativeBuildInputs = [ pybind11 setuptools - wheel ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pikepdf/paths.patch b/pkgs/development/python-modules/pikepdf/paths.patch index c9c61176aa6f..1bd030c186c2 100644 --- a/pkgs/development/python-modules/pikepdf/paths.patch +++ b/pkgs/development/python-modules/pikepdf/paths.patch @@ -1,18 +1,18 @@ diff --git a/src/pikepdf/_methods.py b/src/pikepdf/_methods.py -index d27c660..6796984 100644 +index da40043f..4f566f01 100644 --- a/src/pikepdf/_methods.py +++ b/src/pikepdf/_methods.py -@@ -72,7 +72,7 @@ def _mudraw(buffer, fmt) -> bytes: +@@ -74,7 +74,7 @@ def _mudraw(buffer, fmt) -> bytes: tmp_in.flush() proc = run( -- ['mudraw', '-F', fmt, '-o', '-', tmp_in.name], -+ ['@mudraw@', '-F', fmt, '-o', '-', tmp_in.name], +- ['mutool', 'draw', '-F', fmt, '-o', '-', tmp_in.name], ++ ['@mutool@', 'draw', '-F', fmt, '-o', '-', tmp_in.name], capture_output=True, check=True, ) diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py -index f89b4f9..f187ebd 100644 +index f89b4f90..f187ebdf 100644 --- a/src/pikepdf/jbig2.py +++ b/src/pikepdf/jbig2.py @@ -63,7 +63,7 @@ class JBIG2Decoder(JBIG2DecoderInterface):