diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-05-17 18:34:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-17 18:34:10 +0200 |
| commit | 580a5c510186ff2a24ada6bfc69ccbf34f1ebe3d (patch) | |
| tree | 9f786bfdf852cc3204fe07b1e987c3df242863a8 | |
| parent | a58f4d72bbf5f2d1b94b08d3f586a745aea73b39 (diff) | |
| parent | 2220d2b93b4bb625b7f730afdf16ca8a579c46dd (diff) | |
Merge pull request #311451 from leona-ya/paperless-ngx-2.8.3
paperless-ngx: 2.7.2 -> 2.8.5
| -rw-r--r-- | pkgs/applications/office/paperless-ngx/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/python-modules/django-auditlog/default.nix | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 808b04f3a329b..d16e86581ed4e 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -24,13 +24,13 @@ }: let - version = "2.7.2"; + version = "2.8.5"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-vXW2d45Mth3Y95xPPH8bFjVLWVdUl+WuvSXJyPD3FyU="; + hash = "sha256-ggPT+XIRVEvc8/q1ifoeBSWv3KqcpUaDtV6fo9n3XQ4="; }; # subpath installation is broken with uvicorn >= 0.26 @@ -74,7 +74,7 @@ let cd src-ui ''; - npmDepsHash = "sha256-MJ5pnQChghZBfVN6Lbz6VcMtbe8QadiFLTsMF5TlebQ="; + npmDepsHash = "sha256-xRUZnFekzWHPtlUbpt0JZmlNjdjS1bBZDz8MmH8DC2U="; nativeBuildInputs = [ pkg-config @@ -244,6 +244,7 @@ python.pkgs.buildPythonApplication rec { disabledTests = [ # FileNotFoundError(2, 'No such file or directory'): /build/tmp... "test_script_with_output" + "test_script_exit_non_zero" # AssertionError: 10 != 4 (timezone/time issue) # Due to getting local time from modification date in test_consumer.py "testNormalOperation" diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix index 4a176b0b14ec3..ef7fbb133f476 100644 --- a/pkgs/development/python-modules/django-auditlog/default.nix +++ b/pkgs/development/python-modules/django-auditlog/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django-auditlog"; - version = "2.2.2"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "jazzband"; - repo = pname; + repo = "django-auditlog"; rev = "v${version}"; - hash = "sha256-QHSGqtpkOgltAg+RlG/Ik3DfEjtSWt45sqlD+Zw4Bh0="; + hash = "sha256-SJ4GJp/gVIxiLbdAj3ZS+weevqIDZCMQnW/pqc5liJU="; }; nativeBuildInputs = [ @@ -46,9 +46,11 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck + # strip escape codes otherwise tests fail + # see https://github.com/jazzband/django-auditlog/issues/644 TEST_DB_USER=$PGUSER \ TEST_DB_HOST=$PGHOST \ - ${python.interpreter} runtests.py + ${python.interpreter} runtests.py | cat runHook postCheck ''; |