diff --git a/pkgs/by-name/pd/pdfding/frontend.nix b/pkgs/by-name/pd/pdfding/frontend.nix index 7e10dda1567c..13df27f63e66 100644 --- a/pkgs/by-name/pd/pdfding/frontend.nix +++ b/pkgs/by-name/pd/pdfding/frontend.nix @@ -7,6 +7,8 @@ tailwindcss_4, nodejs, + + pdfding, }: let pdfjsVersion = "5.5.207"; # see update script @@ -26,19 +28,13 @@ let }; in stdenv.mkDerivation (finalAttrs: { - pname = "pdfding-frontend"; - version = "1.7.1"; - src = fetchFromGitHub { - owner = "mrmn2"; - repo = "PdfDing"; - tag = "v${finalAttrs.version}"; - hash = "sha256-T3Y9eWwBVxGPISZ3EZndAR6mwsq4g67RRCPpoZPuh+0="; - }; + pname = "${pdfding.pname}-frontend"; + inherit (pdfding) src version; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - name = "pdfding-frontend-${finalAttrs.version}-npm-deps"; - hash = "sha256-an4KKKx65ehCm1YAlwLWYAW8pQMgB4HdDERqC/hfQi0="; + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + hash = "sha256-HOGnzDKg1ca/27u1oQEtOkOl6Cg/7k+aLJEJhbypUhE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pd/pdfding/package.nix b/pkgs/by-name/pd/pdfding/package.nix index fcc50b33aa0e..494924814094 100644 --- a/pkgs/by-name/pd/pdfding/package.nix +++ b/pkgs/by-name/pd/pdfding/package.nix @@ -12,12 +12,12 @@ let in python.pkgs.buildPythonPackage (finalAttrs: { pname = "pdfding"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "mrmn2"; repo = "PdfDing"; tag = "v${finalAttrs.version}"; - hash = "sha256-T3Y9eWwBVxGPISZ3EZndAR6mwsq4g67RRCPpoZPuh+0="; + hash = "sha256-a12Rq4fd3XEW6ZTsm8ISklpMu0ZKpeBrZXNh9My3vUQ="; }; pyproject = true; @@ -125,12 +125,12 @@ python.pkgs.buildPythonPackage (finalAttrs: { ''; pythonRelaxDeps = [ + "rapidfuzz" "django" - "django-allauth" "gunicorn" - "markdown" "nh3" "pypdf" + "pypdfium2" "whitenoise" ];