From 3f2f5bd9e69404aaa05dd323776c158040533fab Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Thu, 22 Jun 2023 20:16:27 +0200 Subject: [PATCH 1/3] python3Packages.tika-client: 0.1.0 -> 0.1.1 --- pkgs/development/python-modules/tika-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tika-client/default.nix b/pkgs/development/python-modules/tika-client/default.nix index dd35429d88a6..e219fe342102 100644 --- a/pkgs/development/python-modules/tika-client/default.nix +++ b/pkgs/development/python-modules/tika-client/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { pname = "tika-client"; - version = "0.1.0"; + version = "0.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "tika-client"; rev = version; - hash = "sha256-c/4zoXxxrKA5uIz0esdNBmX1DYOiXrkCH1ePGUpEXRY="; + hash = "sha256-QVNUOL0BWSxIkuKPWrKnWDupqn6bQ40G4Nd+ctb41Xw="; }; propagatedBuildInputs = [ From 1340ad859250af8e566d7d46e514287bde89e2cf Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Thu, 22 Jun 2023 20:16:50 +0200 Subject: [PATCH 2/3] paperless-ngx: 1.16.1 -> 1.16.3 --- .../office/paperless-ngx/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 3ffc7f65caaf..4c3f861b2bda 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -17,29 +17,19 @@ }: let - version = "1.16.1"; + version = "1.16.3"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-KmCUViKyjS/1+PL48TOeamYjSkg4J6ywvHgcIhNtVss="; + hash = "sha256-DudTg7d92/9WwaPtr2PrvojcGxZ8z3Z2oYA0LcrkxZI="; }; # Use specific package versions required by paperless-ngx python = python3.override { packageOverrides = self: super: { django = super.django_4; - - # 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 { - rev = version; - hash = "sha256-IKPTQ4n/j/W292F0JpSEUC0X8E1tr961WEcNCN5ymoU="; - }; - }); }; }; @@ -59,7 +49,7 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-GDdHlrU1x/uxDy4mwK7G4F9b7AJat3nhQESUpfDdKeE="; + npmDepsHash = "sha256-rzIDivZTZZWt6kgLt8mstYmvv5TlC+O8O/g01+aLMHQ="; nativeBuildInputs = [ python3 @@ -76,6 +66,13 @@ let "--" "--configuration" "production" ]; + doCheck = true; + checkPhase = '' + runHook preCheck + npm run test + runHook postCheck + ''; + installPhase = '' runHook preInstall mkdir -p $out/lib/paperless-ui From 8ae2739959c5cb3cb42806e949a0992c189523e6 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Thu, 22 Jun 2023 23:10:59 +0200 Subject: [PATCH 3/3] paperless-ngx: restrict platforms to linux darwin is not supported upstream, and the build fails there --- pkgs/applications/office/paperless-ngx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 4c3f861b2bda..1993a2895e36 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -288,6 +288,7 @@ python.pkgs.buildPythonApplication rec { homepage = "https://docs.paperless-ngx.com/"; changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}"; license = licenses.gpl3Only; + platforms = platforms.linux; maintainers = with maintainers; [ lukegb gador erikarvstedt ]; }; }