From 3e428b78d5e30abb97f927f371bb212c25ba0e9d Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sat, 26 Apr 2025 17:14:27 +0200
Subject: [PATCH] django-filingcabinet: 0.17-unstable-2024-11-15 ->
 0.17-unstable-2025-04-10

---
 .../django-filingcabinet/default.nix          | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix
index f2bb49b0d4e8..24289add7fce 100644
--- a/pkgs/development/python-modules/django-filingcabinet/default.nix
+++ b/pkgs/development/python-modules/django-filingcabinet/default.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   buildPythonPackage,
   fetchFromGitHub,
@@ -28,13 +29,15 @@
   poppler-utils,
   pytest-playwright,
   playwright-driver,
-  pnpm_9,
+  pnpm,
   nodejs,
+  markdown,
+  nh3,
 }:
 
 buildPythonPackage rec {
   pname = "django-filingcabinet";
-  version = "0.17-unstable-2024-11-15";
+  version = "0.17-unstable-2025-04-10";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -42,11 +45,13 @@ buildPythonPackage rec {
     repo = "django-filingcabinet";
     # No release tagged yet on GitHub
     # https://github.com/okfde/django-filingcabinet/issues/69
-    rev = "33c88e1ca9fccd0ea70f8b609580eeec486bda5c";
-    hash = "sha256-p7VJUiO7dhTR+S3/4QrmrQeJO6xGj7D7I8W3CBF+jo8=";
+    rev = "64b7b4ad804067e2f16e8a0f165c139e3ffe5fb5";
+    hash = "sha256-48Peui/5N/GfzWS1EJ5uKeKEoPjX+fPEXzG2owxsDaE=";
   };
 
   postPatch = ''
+    # zipstream is discontinued and outdated
+    # https://github.com/okfde/django-filingcabinet/issues/90
     substituteInPlace pyproject.toml \
       --replace-fail "zipstream" "zipstream-ng"
   '';
@@ -55,7 +60,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     nodejs
-    pnpm_9.configHook
+    pnpm.configHook
   ];
 
   dependencies = [
@@ -68,6 +73,8 @@ buildPythonPackage rec {
     djangorestframework
     feedgen
     jsonschema
+    markdown
+    nh3
     pikepdf
     pycryptodome
     pypdf
@@ -85,9 +92,9 @@ buildPythonPackage rec {
     #annotate = [ fcdocs-annotate ];
   };
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm.fetchDeps {
     inherit pname version src;
-    hash = "sha256-32kOhB2+37DD4hKXKep08iDxhXpasKPfcv9fkwISxeU=";
+    hash = "sha256-uMO2iEOi9ACYdIM8Thf7+y1KpHQEqVxO3yxZ8RaGFXA=";
   };
 
   postBuild = ''
@@ -117,13 +124,19 @@ buildPythonPackage rec {
     "test_document_viewer"
   ];
 
-  preCheck = ''
-    export DJANGO_SETTINGS_MODULE="test_project.settings"
-    export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}"
-  '';
+  preCheck =
+    ''
+      export DJANGO_SETTINGS_MODULE="test_project.settings"
+    ''
+    + lib.optionalString (!stdenv.hostPlatform.isRiscV) ''
+      export PLAYWRIGHT_BROWSERS_PATH="${playwright-driver.browsers}"
+    '';
 
   pythonImportsCheck = [ "filingcabinet" ];
 
+  # Playwright tests not supported on RiscV yet
+  doCheck = lib.meta.availableOn stdenv.hostPlatform playwright-driver.browsers;
+
   meta = {
     description = "Django app that manages documents with pages, annotations and collections";
     homepage = "https://github.com/okfde/django-filingcabinet";