diff --git a/pkgs/by-name/oc/ocrodjvu/package.nix b/pkgs/by-name/oc/ocrodjvu/package.nix index e42ceb81f101..039660149e7b 100644 --- a/pkgs/by-name/oc/ocrodjvu/package.nix +++ b/pkgs/by-name/oc/ocrodjvu/package.nix @@ -20,14 +20,14 @@ python3Packages.buildPythonApplication rec { pname = "ocrodjvu"; - version = "0.13.2"; + version = "0.14"; pyproject = true; src = fetchFromGitHub { owner = "FriedrichFroebel"; repo = "ocrodjvu"; - rev = version; - hash = "sha256-EiMCrRFUAJbu9QLgKpFIKqigCZ77lpTDD6AvZuMbyhA="; + tag = version; + hash = "sha256-/TPo8YCE8JKKKBBeV12ilgTNDmuklwfy0TPI/7dBiOs="; }; build-system = with python3Packages; [ diff --git a/pkgs/development/python-modules/python-djvulibre/default.nix b/pkgs/development/python-modules/python-djvulibre/default.nix index 235e12246730..c505e132ee07 100644 --- a/pkgs/development/python-modules/python-djvulibre/default.nix +++ b/pkgs/development/python-modules/python-djvulibre/default.nix @@ -1,44 +1,41 @@ { lib, - buildPythonPackage, + python3Packages, fetchFromGitHub, - cython, djvulibre, ghostscript_headless, - packaging, pkg-config, - setuptools, unittestCheckHook, - wheel, }: -buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "python-djvulibre"; - version = "0.9.1"; + version = "0.9.3"; pyproject = true; src = fetchFromGitHub { owner = "FriedrichFroebel"; repo = "python-djvulibre"; tag = version; - hash = "sha256-5jOJyVPGJvR4YgxgJgyN47/OzsK3ASJXfn1Gt9y8rbs="; + hash = "sha256-ntDRntNxVchZm+i+qBbiZlfHAXJRKMin9Hi+BoJQjTM="; }; - nativeBuildInputs = [ - cython - packaging + build-system = [ + python3Packages.cython + djvulibre + ghostscript_headless pkg-config - setuptools - wheel + python3Packages.setuptools ]; - buildInputs = [ + dependencies = with python3Packages; [ djvulibre ghostscript_headless ]; preCheck = '' rm -rf djvu + rm -rf tests/examples ''; nativeCheckInputs = [ unittestCheckHook ];