From c13699ad67cdcb0a5cf1a3cc6963a5806253f052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 25 Feb 2024 04:06:45 +0100 Subject: [PATCH 1/2] paperless-ngx: 2.5.2 -> 2.5.3 --- pkgs/applications/office/paperless-ngx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 319234289515..bd99d093b097 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -22,13 +22,13 @@ }: let - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-v6k9clKNBNb2MQp0BTrUL9zfY6SUKfzaaOycmV8RKyk="; + hash = "sha256-fZ5grVZjCVkCH6doeqBLHPh9mPvHkiz+QXi/OyoJhR4="; }; python = python3; @@ -280,7 +280,7 @@ python.pkgs.buildPythonApplication rec { # Disable unneeded code coverage test substituteInPlace src/setup.cfg \ - --replace "--cov --cov-report=html --cov-report=xml" "" + --replace-fail "--cov --cov-report=html --cov-report=xml" "" ''; disabledTests = [ From 11cc6bd7988224e1c41e4af7547e5f788cd963f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 25 Feb 2024 04:08:08 +0100 Subject: [PATCH 2/2] paperless-ngx: cleanup dependencies --- .../office/paperless-ngx/default.nix | 78 +------------------ 1 file changed, 4 insertions(+), 74 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index bd99d093b097..704689e20282 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -99,30 +99,12 @@ python.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python.pkgs; [ - amqp - anyio - asgiref - async-timeout - attrs - autobahn - automat - billiard bleach - celery - certifi - cffi - channels-redis channels - charset-normalizer - click - click-didyoumean - click-plugins - click-repl - coloredlogs + channels-redis concurrent-log-handler - constantly - cryptography dateparser + django django-allauth django-auditlog django-celery-results @@ -132,92 +114,41 @@ python.pkgs.buildPythonApplication rec { django-filter django-guardian django-multiselectfield - django - djangorestframework-guardian2 djangorestframework + djangorestframework-guardian2 drf-writable-nested filelock flower gotenberg-client gunicorn - h11 - h2 - hiredis - httptools - httpx - humanfriendly - humanize - hyperlink - idna imap-tools - img2pdf - incremental - inotify-simple inotifyrecursive - joblib langdetect - lxml - msgpack mysqlclient nltk ocrmypdf - packaging pathvalidate pdf2image - pikepdf - pillow - pluggy - portalocker - prompt-toolkit psycopg2 - pyasn1-modules - pyasn1 - pycparser - pyopenssl python-dateutil python-dotenv + python-gnupg python-ipware python-magic - python-gnupg - pytz - pyyaml pyzbar rapidfuzz redis - regex - reportlab - requests scikit-learn - scipy setproctitle - service-identity - sniffio - sqlparse - threadpoolctl tika-client - tornado tqdm - twisted - txaio - tzdata - tzlocal - urllib3 uvicorn - uvloop - vine watchdog - watchfiles - wcwidth - webencodings - websockets whitenoise whoosh - zipp - zope-interface zxing-cpp ] ++ redis.optional-dependencies.hiredis - ++ twisted.optional-dependencies.tls ++ uvicorn.optional-dependencies.standard; postBuild = '' @@ -262,7 +193,6 @@ python.pkgs.buildPythonApplication rec { pytest-rerunfailures pytest-xdist pytestCheckHook - reportlab ]; pytestFlagsArray = [