From 7115d8a728d44b4121c6b56be0d71072d135a3a4 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Wed, 29 Nov 2023 21:08:10 +0100 Subject: [PATCH] paperless-ngx: 1.17.4 -> 2.0.1 --- .../office/paperless-ngx/default.nix | 36 +++++++------------ 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index c5c291511ebb..31816fc203fa 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -20,21 +20,16 @@ }: let - version = "1.17.4"; + version = "2.0.1"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-Kl8AUfHfEiEy40qeDI8x2rxdXcj01mpitw7T/96ibQQ="; + hash = "sha256-qSX+r99y7a/eITfaC/UYqSgcxx/xYOqJ4tY/iuvoeNA="; }; - # Use specific package versions required by paperless-ngx - python = python3.override { - packageOverrides = self: super: { - django = super.django_4; - }; - }; + python = python3; path = lib.makeBinPath [ ghostscript @@ -52,7 +47,7 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-5Q9NtIO7k/6AiF9Er10HhmEBFyQOP9CiTkTZglUeChg="; + npmDepsHash = "sha256-uDaZ7j7IDgKy7wCWND2xzR1qHwUtdyjR4eyIAVy01dM="; nativeBuildInputs = [ python3 @@ -92,16 +87,6 @@ python.pkgs.buildPythonApplication rec { inherit version src; - patches = [ - # https://github.com/paperless-ngx/paperless-ngx/pull/4146 - (fetchpatch { - name = "fix-tests-for-python311.patch"; - url = "https://github.com/paperless-ngx/paperless-ngx/commit/73f6c0a056e3859061339e295f57213fd4239b2d.patch"; - hash = "sha256-sZcRug5T4cw5ppKpGYrrfz9RxtYxnkeNOlXcMgdWT0E="; - }) - ]; - - nativeBuildInputs = [ gettext ]; @@ -131,18 +116,24 @@ python.pkgs.buildPythonApplication rec { constantly cryptography dateparser + django-auditlog django-celery-results - django-cors-headers django-compression-middleware + django-cors-headers django-extensions django-filter django-guardian + django-multiselectfield django djangorestframework-guardian2 djangorestframework + drf-writable-nested filelock + flower + gotenberg-client gunicorn h11 + h2 hiredis httptools httpx @@ -178,8 +169,8 @@ python.pkgs.buildPythonApplication rec { python-dateutil python-dotenv python-ipware - python-gnupg python-magic + python-gnupg pytz pyyaml pyzbar @@ -190,8 +181,8 @@ python.pkgs.buildPythonApplication rec { requests scikit-learn scipy - service-identity setproctitle + service-identity sniffio sqlparse threadpoolctl @@ -255,7 +246,6 @@ python.pkgs.buildPythonApplication rec { daphne factory-boy imagehash - pdfminer-six pytest-django pytest-env pytest-httpx