From f355a035fd2984f27ae0ade42c054ddd324653de Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 27 Jul 2026 10:13:29 +0530 Subject: [PATCH 1/3] pdfding: 1.10.0 -> 1.11.0 Diff: https://github.com/mrmn2/PdfDing/compare/v1.10.0...v1.11.0 Changelog: https://github.com/mrmn2/PdfDing/releases/tag/v1.11.0 Signed-off-by: phanirithvij (cherry picked from commit 8c58aab60ba394eccb3477151cc11cda5869aa14) --- pkgs/by-name/pd/pdfding/frontend.nix | 4 ++-- pkgs/by-name/pd/pdfding/package.nix | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pd/pdfding/frontend.nix b/pkgs/by-name/pd/pdfding/frontend.nix index 76090903d5e0..454fd415c04d 100644 --- a/pkgs/by-name/pd/pdfding/frontend.nix +++ b/pkgs/by-name/pd/pdfding/frontend.nix @@ -8,8 +8,8 @@ pdfding, }: let - pdfjsVersion = "5.5.207"; # see update script - pdfjsHash = "sha256-HikisEa6L+BqsG6imgWhV+4J46BluU5zqU1nFZAG0eM="; + pdfjsVersion = "6.1.200"; # see update script + pdfjsHash = "sha256-8hByPf4BXTXakRxomXtknthlCLcjG/pCLVnjMxqrROI="; pdfjs = fetchzip { url = "https://github.com/mozilla/pdf.js/releases/download/v${pdfjsVersion}/pdfjs-${pdfjsVersion}-dist.zip"; hash = pdfjsHash; diff --git a/pkgs/by-name/pd/pdfding/package.nix b/pkgs/by-name/pd/pdfding/package.nix index 14be17f12abe..c91b06171ddc 100644 --- a/pkgs/by-name/pd/pdfding/package.nix +++ b/pkgs/by-name/pd/pdfding/package.nix @@ -12,22 +12,21 @@ let in python.pkgs.buildPythonPackage (finalAttrs: { pname = "pdfding"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "mrmn2"; repo = "PdfDing"; tag = "v${finalAttrs.version}"; - hash = "sha256-C1osj8V9+z3ahl4+zUtyI22GMtSgNLzfdGttL7gPDvY="; + hash = "sha256-9gvuU/u8J717Zo7p35kUHX+VNY+c2Ex6vRwMpYr864U="; }; pyproject = true; strictDeps = true; __structuredAttrs = true; - # remove supervisor from dependencies and fix version + # remove supervisor from dependencies, we use systemd postPatch = '' sed -i 's/supervisor.*$//' pyproject.toml - sed -i 's/^version = .*$/version = "${finalAttrs.version}"/' pyproject.toml ''; dependencies = @@ -66,6 +65,7 @@ python.pkgs.buildPythonPackage (finalAttrs: { nativeBuildInputs = [ makeWrapper + python.pkgs.pyprojectVersionPatchHook ]; optional-dependencies = { @@ -132,6 +132,7 @@ python.pkgs.buildPythonPackage (finalAttrs: { "''${makeWrapperArgs[@]}" ''; + # NOTE: don't undo relaxing of any of these, they are bound to break again pythonRelaxDeps = [ "django" "django-allauth" From 1738eeeff50f1368848377f2789df2a69b3a8b80 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 3 Aug 2026 14:03:05 +0530 Subject: [PATCH 2/3] pdfding: 1.11.0 -> 1.12.0 Diff: https://github.com/mrmn2/PdfDing/compare/v1.11.0...v1.12.0 Changelog: https://github.com/mrmn2/PdfDing/releases/tag/v1.12.0 Signed-off-by: phanirithvij (cherry picked from commit 8da67b34c2c0dcd90e8dfbb9d78637c9868191ba) --- pkgs/by-name/pd/pdfding/frontend.nix | 2 +- pkgs/by-name/pd/pdfding/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pd/pdfding/frontend.nix b/pkgs/by-name/pd/pdfding/frontend.nix index 454fd415c04d..f8ee7827db89 100644 --- a/pkgs/by-name/pd/pdfding/frontend.nix +++ b/pkgs/by-name/pd/pdfding/frontend.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "pdfding-${finalAttrs.version}-npm-deps"; - hash = "sha256-TDX2xoHj07aUeuLPt/TlgkdRdTiv3fNbriChzEB4EXk="; + hash = "sha256-4mnw9sLQBZCBqmTKkjNHx03pgmvQ4CuDg3NOke4vMHs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pd/pdfding/package.nix b/pkgs/by-name/pd/pdfding/package.nix index c91b06171ddc..59fe84d69daf 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.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "mrmn2"; repo = "PdfDing"; tag = "v${finalAttrs.version}"; - hash = "sha256-9gvuU/u8J717Zo7p35kUHX+VNY+c2Ex6vRwMpYr864U="; + hash = "sha256-LcZa9BxP99lI7Hqt3seyBeFNn4oLtR31yjq3Ap/IwUE="; }; pyproject = true; From 68d7d0ab28be776b26b301c9e54577c3a21336e1 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Mon, 3 Aug 2026 22:43:51 +0530 Subject: [PATCH 3/3] pdfding: patch version manually Not-cherry-picked-because: pyprojectVersionPatchHook not available in 26.05 Signed-off-by: phanirithvij --- pkgs/by-name/pd/pdfding/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pd/pdfding/package.nix b/pkgs/by-name/pd/pdfding/package.nix index 59fe84d69daf..c31c6ef1d0ec 100644 --- a/pkgs/by-name/pd/pdfding/package.nix +++ b/pkgs/by-name/pd/pdfding/package.nix @@ -25,8 +25,10 @@ python.pkgs.buildPythonPackage (finalAttrs: { __structuredAttrs = true; # remove supervisor from dependencies, we use systemd + # and fix version, TODO move to pyprojectVersionPatchHook when it is available in stable 26.05 postPatch = '' sed -i 's/supervisor.*$//' pyproject.toml + sed -i 's/^version = .*$/version = "${finalAttrs.version}"/' pyproject.toml ''; dependencies = @@ -65,7 +67,6 @@ python.pkgs.buildPythonPackage (finalAttrs: { nativeBuildInputs = [ makeWrapper - python.pkgs.pyprojectVersionPatchHook ]; optional-dependencies = {