Merge pull request #239239 from leona-ya/paperless-1-16-3

paperless-ngx: 1.16.1 -> 1.16.3, python3Packages.tika-client: 0.1.0 -> 0.1.1

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
@@ -291,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 ];
   };
 }

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 = [