Merge pull request #192260 from gador/paperless-ngx-1.9.0

paperless-ngx: 1.8.0 -> 1.9.1

pkgs/applications/office/paperless-ngx/default.nix

@@ -26,17 +26,12 @@ let
         src = fetchFromGitHub {
           owner = "paperless-ngx";
           repo = "django-q";
-          sha256 = "sha256-aoDuPig8Nf8fLzn7GjBn69aF2zH2l8gxascAu9lIG3U=";
-          rev = "71abc78fdaec029cf71e9849a3b0fa084a1678f7";
+          hash = "sha256-alu7tZwUn77xhUF9c/aGmwRwO//mR/FucXjvXUl/6ek=";
+          rev = "8b5289d8caf36f67fb99448e76ead20d5b498c1b";
         };
         # due to paperless-ngx modification of the pyproject.toml file
         # the patch is not needed any more
-        patches = [];
-      });
-
-      # django-extensions 3.1.5 is required, but its tests are incompatible with Django 4
-      django-extensions = super.django-extensions.overridePythonAttrs (_: {
-        doCheck = false;
+        patches = [ ];
       });
 
       aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec {
@@ -62,12 +57,12 @@ let
 in
 python.pkgs.pythonPackages.buildPythonApplication rec {
   pname = "paperless-ngx";
-  version = "1.8.0";
+  version = "1.9.1";
 
   # Fetch the release tarball instead of a git ref because it contains the prebuilt fontend
   src = fetchurl {
     url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz";
-    hash = "sha256-BLfhh04RvBJFRQiPXkMl8XlWqZOWKmjjl+6lZ326stU=";
+    hash = "sha256-KWq3zUES8klXexNO9krlqZKZEajOhkTHF13t/3rxrPc=";
   };
 
   format = "other";
@@ -116,6 +111,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec {
     inotifyrecursive
     joblib
     langdetect
+    pkgs.libmysqlclient
     lxml
     msgpack
     numpy

pkgs/applications/office/pdfmixtool/default.nix

@@ -1,23 +1,25 @@
 { lib
 , mkDerivation
 , fetchFromGitLab
+, fetchpatch
 , cmake
 , pkg-config
 , qtbase
 , qttools
 , qpdf
 , podofo
+, imagemagick
 }:
 
 mkDerivation rec {
   pname = "pdfmixtool";
-  version = "1.0.2";
+  version = "1.1";
 
   src = fetchFromGitLab {
     owner = "scarpetta";
     repo = pname;
     rev = "v${version}";
-    sha256 = "066ap1w05gj8n0kvilyhlr1fzwrmlczx3lax7mbw0rfid9qh3467";
+    hash = "sha256-S8hhWZ6nHyIWPwsfl+o9XnljLD3aE/vthCLuWEbm5nc=";
   };
 
   nativeBuildInputs = [
@@ -26,12 +28,22 @@ mkDerivation rec {
   ];
 
   buildInputs = [
+    imagemagick
     qtbase
     qttools
     qpdf
     podofo
   ];
 
+  patches = [
+    # fix incompatibility with qpdf11
+    (fetchpatch {
+      url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/81f7e96f6e68dfeba3cd4e00d8553dfdd2d7f2fa.diff";
+      hash = "sha256-uBchYjUIqL7dJR7U/TSxhSGu1qY742cFUIv0XKU6L2g=";
+    })
+
+  ];
+
   meta = with lib; {
     description = "An application to split, merge, rotate and mix PDF files";
     homepage = "https://gitlab.com/scarpetta/pdfmixtool";

pkgs/development/libraries/qpdf/default.nix

@@ -1,29 +1,28 @@
-{ lib, stdenv, fetchFromGitHub, libjpeg, zlib, perl }:
+{ lib, stdenv, fetchFromGitHub, libjpeg, zlib, cmake, perl }:
 
 stdenv.mkDerivation rec {
   pname = "qpdf";
-  version = "10.6.3";
+  version = "11.1.0";
 
   src = fetchFromGitHub {
     owner = "qpdf";
     repo = "qpdf";
-    rev = "release-qpdf-${version}";
-    hash = "sha256-SiZA8T7N1SWlbCFosSqFosLDV/3Q7+ywvgq1iB4umdg=";
+    rev = "v${version}";
+    hash = "sha256-T06BLtDZN6ulJ9Po3LN1RlI6q8ddAfo95RAhyfrn+qg=";
   };
 
-  nativeBuildInputs = [ perl ];
+  nativeBuildInputs = [ cmake perl ];
 
   buildInputs = [ zlib libjpeg ];
 
-  configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
-                     "--with-random=/dev/urandom";
-
-  preCheck = ''
+  preConfigure = ''
     patchShebangs qtest/bin/qtest-driver
+    patchShebangs run-qtest
+    # qtest needs to know where the source code is
+    substituteInPlace CMakeLists.txt --replace "run-qtest" "run-qtest --top $src --code $src --bin $out"
   '';
 
   doCheck = true;
-  enableParallelBuilding = true;
 
   meta = with lib; {
     homepage = "http://qpdf.sourceforge.net/";

pkgs/development/python-modules/pikepdf/default.nix

@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "pikepdf";
-  version = "5.4.2";
+  version = "6.0.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm "$out/.git_archival.txt"
     '';
-    hash = "sha256-b4QUn+wfkk6Yx74ViBg6yaE1+bXtxidoyXYgBaJ9iiM=";
+    hash = "sha256-rwMSmARUrScG2nmiYBSkcq0NuUMhn0pHOPvgdKZbH7w=";
   };
 
   patches = [
@@ -51,10 +51,8 @@ buildPythonPackage rec {
   ];
 
   postPatch = ''
-    sed -i 's|\S*/opt/homebrew.*|pass|' setup.py
-
     substituteInPlace setup.py \
-      --replace setuptools_scm_git_archive ""
+      --replace "shims_enabled = not cflags_defined" "shims_enabled = False"
   '';
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/pikepdf/paths.patch

@@ -12,10 +12,10 @@ index 2a170c6..5ee3ba1 100644
              check=True,
          )
 diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py
-index be390a1..3818ec3 100644
+index 28c596b..aff3565 100644
 --- a/src/pikepdf/jbig2.py
 +++ b/src/pikepdf/jbig2.py
-@@ -31,7 +31,7 @@ def extract_jbig2(
+@@ -28,7 +28,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes:
          output_path = Path(tmpdir) / "outfile"
 
          args = [
@@ -24,21 +24,12 @@ index be390a1..3818ec3 100644
              "--embedded",
              "--format",
              "png",
-@@ -64,7 +64,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes:
-         output_path = Path(tmpdir) / "outfile"
- 
-         args = [
--            "jbig2dec",
-+            "@jbig2dec@",
-             "--embedded",
-             "--format",
-             "png",
-@@ -100,7 +100,7 @@ def extract_jbig2_bytes(
- 
- def _check_jbig2dec_available() -> None:  # pragma: no cover
+@@ -88,7 +88,7 @@ class JBIG2Decoder(JBIG2DecoderInterface):
+     def _version(self) -> Version:
          try:
--        proc = run(['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii')
-+        proc = run(['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii')
+             proc = run(
+-                ['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii'
++                ['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii'
+             )
          except (CalledProcessError, FileNotFoundError) as e:
              raise DependencyError("jbig2dec - not installed or not found") from e
-     else: