From 7694f305d4d9f0263961b00ccec6ed86859ee369 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Fri, 10 Jul 2026 07:49:32 +0530 Subject: [PATCH 1/3] pdfding: 1.9.0 -> 1.10.0 Diff: https://github.com/mrmn2/PdfDing/compare/v1.9.0...v1.10.0 Changelog: https://github.com/mrmn2/PdfDing/releases/tag/v1.10.0 Signed-off-by: phanirithvij --- pkgs/by-name/pd/pdfding/frontend.nix | 2 +- pkgs/by-name/pd/pdfding/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pd/pdfding/frontend.nix b/pkgs/by-name/pd/pdfding/frontend.nix index 2f561bf59dd6..5a1c5566b523 100644 --- a/pkgs/by-name/pd/pdfding/frontend.nix +++ b/pkgs/by-name/pd/pdfding/frontend.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "pdfding-${finalAttrs.version}-npm-deps"; - hash = "sha256-fxhDP/kyDfL1uiZCUNr2Cd6vDnyb9V+gTSNPyjSIm18="; + hash = "sha256-TDX2xoHj07aUeuLPt/TlgkdRdTiv3fNbriChzEB4EXk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pd/pdfding/package.nix b/pkgs/by-name/pd/pdfding/package.nix index 76dbeefde5a5..c5657c801ce9 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.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "mrmn2"; repo = "PdfDing"; tag = "v${finalAttrs.version}"; - hash = "sha256-r3hO92iriQ/0KDl+D/0j5RoneTTCDmt8m4e7ugzyOPs="; + hash = "sha256-C1osj8V9+z3ahl4+zUtyI22GMtSgNLzfdGttL7gPDvY="; }; pyproject = true; @@ -132,11 +132,11 @@ python.pkgs.buildPythonPackage (finalAttrs: { ''; pythonRelaxDeps = [ + "django" "gunicorn" "huey" "nh3" "psycopg2-binary" - "pypdf" "pypdfium2" ]; From 656f072b88e8f1c82b038265232bfade43ae8e97 Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Fri, 10 Jul 2026 10:22:37 +0530 Subject: [PATCH 2/3] nixosTests.pdfding.s3-backup: fix test Signed-off-by: phanirithvij --- nixos/tests/web-apps/pdfding/s3-backups.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/web-apps/pdfding/s3-backups.nix b/nixos/tests/web-apps/pdfding/s3-backups.nix index a3955c968b0d..5a1184b1aea4 100644 --- a/nixos/tests/web-apps/pdfding/s3-backups.nix +++ b/nixos/tests/web-apps/pdfding/s3-backups.nix @@ -31,7 +31,7 @@ in backup.schedule = "*/1 * * * *"; backup.endpoint = "[::]:3900"; extraEnvironment.BACKUP_BUCKET_NAME = "pdfding-bucket"; - extraEnvironment.BACKUP_REGION = "garage"; + extraEnvironment.BACKUP_REGION = "us-east-1"; envFiles = [ pdfding-s3-keys ]; installTestHelpers = true; @@ -48,7 +48,7 @@ in rpc_secret = "5c1915fa04d0b6739675c61bf5907eb0fe3d9c69850c83820f51b4d25d13868c"; s3_api = { - s3_region = "garage"; + s3_region = "us-east-1"; api_bind_addr = "[::]:3900"; root_domain = ".s3.garage"; }; @@ -140,7 +140,7 @@ in -F "description=" \ -F "collection=1" \ -F "use_file_name=on" \ - -F "name=test-upload" \ + -F "name=dummy" \ -F "file=@{test_pdf};type=application/pdf" \ -F "csrfmiddlewaretoken=$csrf_token" \ -H "Referer: {endpoint}/pdf/add" \ From 543ba03fed5bc945da716bfd816386668386296d Mon Sep 17 00:00:00 2001 From: phanirithvij Date: Fri, 10 Jul 2026 10:21:14 +0530 Subject: [PATCH 3/3] nixosTests.pdfding: fix on aarch64-linux Signed-off-by: phanirithvij --- nixos/tests/web-apps/pdfding/basic.nix | 6 ++++++ nixos/tests/web-apps/pdfding/postgres.nix | 10 ++++++++++ nixos/tests/web-apps/pdfding/s3-backups.nix | 10 ++++++++++ 3 files changed, 26 insertions(+) diff --git a/nixos/tests/web-apps/pdfding/basic.nix b/nixos/tests/web-apps/pdfding/basic.nix index 5dec3de378e3..10db93c5203b 100644 --- a/nixos/tests/web-apps/pdfding/basic.nix +++ b/nixos/tests/web-apps/pdfding/basic.nix @@ -17,6 +17,11 @@ secretKeyFile = pkgs.writeText "secretKeyFile" "test123"; }; + # NOTE: on aarch64-linux github actions runer due to lack of kvm, we need to delay pdfding start and give it more time to finish + systemd.services.pdfding.wantedBy = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 (lib.mkForce [ ]); + systemd.services.pdfding.serviceConfig.TimeoutStartSec = + lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 "900"; + environment.systemPackages = with pkgs; [ sqlite ]; @@ -60,6 +65,7 @@ # create admin machine.wait_for_unit("multi-user.target") + machine.succeed("systemctl start pdfding.service") machine.wait_for_open_port(${toString port}) machine.succeed("DJANGO_SUPERUSER_PASSWORD=admin pdfding-manage createsuperuser --no-input --username admin --email admin@localhost") diff --git a/nixos/tests/web-apps/pdfding/postgres.nix b/nixos/tests/web-apps/pdfding/postgres.nix index c6a82fad839a..635799571315 100644 --- a/nixos/tests/web-apps/pdfding/postgres.nix +++ b/nixos/tests/web-apps/pdfding/postgres.nix @@ -22,6 +22,14 @@ installTestHelpers = true; }; + # NOTE: on aarch64-linux github actions runer due to lack of kvm, we need to delay pdfding start and give it more time to finish + systemd.services.pdfding.wantedBy = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 (lib.mkForce [ ]); + systemd.services.pdfding.serviceConfig.TimeoutStartSec = + lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 "900"; + systemd.services.pdfding-background.wantedBy = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 ( + lib.mkForce [ ] + ); + environment.systemPackages = [ config.services.postgresql.finalPackage ]; @@ -46,6 +54,8 @@ # create admin machine.wait_for_unit("multi-user.target") + machine.succeed("systemctl start pdfding.service") + machine.succeed("systemctl start pdfding-background.service") machine.wait_for_open_port(${toString port}) machine.succeed("DJANGO_SUPERUSER_PASSWORD=admin pdfding-manage createsuperuser --no-input --username admin --email admin@localhost") diff --git a/nixos/tests/web-apps/pdfding/s3-backups.nix b/nixos/tests/web-apps/pdfding/s3-backups.nix index 5a1184b1aea4..610acabc9abb 100644 --- a/nixos/tests/web-apps/pdfding/s3-backups.nix +++ b/nixos/tests/web-apps/pdfding/s3-backups.nix @@ -37,6 +37,14 @@ in installTestHelpers = true; }; + # NOTE: on aarch64-linux github actions runer due to lack of kvm, we need to delay pdfding start and give it more time to finish + systemd.services.pdfding.wantedBy = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 (lib.mkForce [ ]); + systemd.services.pdfding.serviceConfig.TimeoutStartSec = + lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 "900"; + systemd.services.pdfding-background.wantedBy = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 ( + lib.mkForce [ ] + ); + # Setup a local garage service for the backup feature # taken from garage nixosTest services.garage = { @@ -113,6 +121,8 @@ in # create admin machine.wait_for_unit("multi-user.target") + machine.succeed("systemctl start pdfding.service") + machine.succeed("systemctl start pdfding-background.service") machine.wait_for_open_port(${toString port}) machine.succeed("DJANGO_SUPERUSER_PASSWORD=admin pdfding-manage createsuperuser --no-input --username admin --email admin@localhost")