From 9ef783d06da93f05afddb3a8df41fcb1987b5cfb Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 23 Aug 2025 10:40:49 +0300
Subject: [PATCH 1/2] python313Packages.django-cachalot: actually use
 pytestCheckHook, skip broken tests

---
 .../django-cachalot/default.nix               | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/django-cachalot/default.nix b/pkgs/development/python-modules/django-cachalot/default.nix
index 7d8377e74039..37e126c50621 100644
--- a/pkgs/development/python-modules/django-cachalot/default.nix
+++ b/pkgs/development/python-modules/django-cachalot/default.nix
@@ -56,19 +56,23 @@ buildPythonPackage rec {
   # redisTestHook does not work on darwin
   doCheck = !stdenv.hostPlatform.isDarwin;
 
-  # disable broken pinning test
   preCheck = ''
-    substituteInPlace cachalot/tests/read.py \
-      --replace-fail \
-        "def test_explain(" \
-        "def _test_explain("
+    export DJANGO_SETTINGS_MODULE=settings
   '';
 
-  checkPhase = ''
-    runHook preCheck
-    ${python.interpreter} runtests.py
-    runHook postCheck
-  '';
+  pytestFlags = [
+    "-o python_files=*.py"
+    "-o collect_imported_tests=false"
+    "cachalot/tests"
+    "cachalot/admin_tests"
+  ];
+
+  disabledTests = [
+    # relies on specific EXPLAIN output format from sqlite, which is not stable
+    "test_explain"
+    # broken on django-debug-toolbar 6.0
+    "test_rendering"
+  ];
 
   meta = with lib; {
     description = "No effort, no worry, maximum performance";

From 413b9e7efc02554bb3dc1837aa9627c1ebcd8723 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 23 Aug 2025 10:57:25 +0300
Subject: [PATCH 2/2] paperless-ngx: drop merged patch

---
 pkgs/by-name/pa/paperless-ngx/package.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 607adc324deb..f191fea5795a 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -152,15 +152,6 @@ python.pkgs.buildPythonApplication rec {
 
   inherit version src;
 
-  # Manual partial backport of:
-  # - https://github.com/paperless-ngx/paperless-ngx/commit/9889c59d3daa8f4ac8ec2400c00ddc36a7ca63c9
-  # - https://github.com/paperless-ngx/paperless-ngx/pull/10538
-  # Fixes build with latest dependency versions.
-  # FIXME: remove in next update
-  patches = [
-    ./dep-updates.patch
-  ];
-
   postPatch = ''
     # pytest-xdist with to many threads makes the tests flaky
     if (( $NIX_BUILD_CORES > 3)); then