From 83809e4609a46da20e3cfe0c0371febc4e939036 Mon Sep 17 00:00:00 2001
From: Moritz 'e1mo' Fromm <git@e1mo.de>
Date: Tue, 16 May 2023 12:26:48 +0200
Subject: [PATCH] paperless-ngx: 1.14.4 -> 1.16.1

Various smaller new features (quick filters from document detail,
explanations for relative dates, pagination for tasks) and various other
bug fixes and minor enhancements. v1.16.0 contains seemingly smaller
features and and changed their tika client libary.
Especially noteworthy for v1.14.5 seems a security fix around the display
of texts in the frontend.

Full changelog available at
https://github.com/paperless-ngx/paperless-ngx/releases/tag/v1.14.5
https://github.com/paperless-ngx/paperless-ngx/releases/tag/v1.15.0
https://github.com/paperless-ngx/paperless-ngx/releases/tag/v1.15.1
https://github.com/paperless-ngx/paperless-ngx/releases/tag/v1.16.0
https://github.com/paperless-ngx/paperless-ngx/releases/tag/v1.16.1
---
 .../office/paperless-ngx/default.nix          | 51 +++++--------------
 1 file changed, 14 insertions(+), 37 deletions(-)

diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix
index a60f926278ef..3ffc7f65caaf 100644
--- a/pkgs/applications/office/paperless-ngx/default.nix
+++ b/pkgs/applications/office/paperless-ngx/default.nix
@@ -17,13 +17,13 @@
 }:
 
 let
-  version = "1.14.4";
+  version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "paperless-ngx";
     repo = "paperless-ngx";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9+8XqENpSdsND6g59oJkVoCe5tJ1Pwo8HD7Cszv/t7o=";
+    hash = "sha256-KmCUViKyjS/1+PL48TOeamYjSkg4J6ywvHgcIhNtVss=";
   };
 
   # Use specific package versions required by paperless-ngx
@@ -31,38 +31,15 @@ let
     packageOverrides = self: super: {
       django = super.django_4;
 
-      aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec {
-        version = "1.3.1";
+      # Paperless tests fail with tika-client==0.1.0. Upstream WIP fix is at
+      # https://github.com/paperless-ngx/paperless-ngx/pull/3617
+      tika-client = super.tika-client.overridePythonAttrs (oldAttrs: rec {
+        version = "0.0.3";
         src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "0fi7jd5hlx8cnv1m97kv9hc4ih4l8v15wzkqwsp73is4n0qazy0m";
-        };
-      });
-
-      channels = super.channels.overridePythonAttrs (oldAttrs: rec {
-        version = "3.0.5";
-        pname = "channels";
-        src = fetchFromGitHub {
-          owner = "django";
-          repo = pname;
           rev = version;
-          sha256 = "sha256-bKrPLbD9zG7DwIYBst1cb+zkDsM8B02wh3D80iortpw=";
-        };
-        propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ self.daphne ];
-        pytestFlagsArray = [ "--asyncio-mode=auto" ];
-      });
-
-      daphne = super.daphne.overridePythonAttrs (oldAttrs: rec {
-        version = "3.0.2";
-        pname = "daphne";
-        src = fetchFromGitHub {
-          owner = "django";
-          repo = pname;
-          rev = version;
-          hash = "sha256-KWkMV4L7bA2Eo/u4GGif6lmDNrZAzvYyDiyzyWt9LeI=";
+          hash = "sha256-IKPTQ4n/j/W292F0JpSEUC0X8E1tr961WEcNCN5ymoU=";
         };
       });
-
     };
   };
 
@@ -82,7 +59,7 @@ let
     pname = "paperless-ngx-frontend";
     inherit version src;
 
-    npmDepsHash = "sha256-XTk4DpQAU/rI2XoUvLm0KVjuXFWdz2wb2EAg8EBVEdU=";
+    npmDepsHash = "sha256-GDdHlrU1x/uxDy4mwK7G4F9b7AJat3nhQESUpfDdKeE=";
 
     nativeBuildInputs = [
       python3
@@ -118,7 +95,6 @@ python.pkgs.buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = with python.pkgs; [
-    aioredis
     amqp
     anyio
     asgiref
@@ -142,7 +118,6 @@ python.pkgs.buildPythonApplication rec {
     concurrent-log-handler
     constantly
     cryptography
-    daphne
     dateparser
     django-celery-results
     django-cors-headers
@@ -150,7 +125,6 @@ python.pkgs.buildPythonApplication rec {
     django-extensions
     django-filter
     django-guardian
-    django-ipware
     django
     djangorestframework-guardian2
     djangorestframework
@@ -174,12 +148,10 @@ python.pkgs.buildPythonApplication rec {
     msgpack
     mysqlclient
     nltk
-    numpy
     ocrmypdf
     packaging
     pathvalidate
     pdf2image
-    pdfminer-six
     pikepdf
     pillow
     pluggy
@@ -192,6 +164,7 @@ python.pkgs.buildPythonApplication rec {
     pyopenssl
     python-dateutil
     python-dotenv
+    python-ipware
     python-gnupg
     python-magic
     pytz
@@ -209,7 +182,7 @@ python.pkgs.buildPythonApplication rec {
     sniffio
     sqlparse
     threadpoolctl
-    tika
+    tika-client
     tornado
     tqdm
     twisted
@@ -266,12 +239,16 @@ python.pkgs.buildPythonApplication rec {
   '';
 
   nativeCheckInputs = with python.pkgs; [
+    daphne
     factory_boy
     imagehash
+    pdfminer-six
     pytest-django
     pytest-env
+    pytest-httpx
     pytest-xdist
     pytestCheckHook
+    reportlab
   ];
 
   pytestFlagsArray = [