From 67c88f3c4b9771055631f574bfa545d59061755d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 11 Nov 2024 12:15:02 -0800 Subject: [PATCH 1/2] immich: re-add perl to $PATH Otherwise logging in to Immich fails with [Nest] 2432071 - 11/11/2024, 9:12:55 PM ERROR [Api:Error: BatchCluster has ended, cannot enqueue -ver -ignoreMinorErrors -execute at BatchCluster.enqueueTask (/nix/store/s68j9ryvlcfayh8wc6s8mbqwbhhsb742-immich-1.120.1/node_modules/batch-cluster/dist/BatchCluster.js:186:25) at f (/nix/store/s68j9ryvlcfayh8wc6s8mbqwbhhsb742-immich-1.120.1/node_modules/exiftool-vendored/dist/ExifTool.js:402:38) at async g (/nix/store/s68j9ryvlcfayh8wc6s8mbqwbhhsb742-immich-1.120.1/node_modules/exiftool-vendored/dist/AsyncRetry.js:8:20)~92ys7db8] Unknown error: Error: BatchCluster has ended, cannot enqueue -ver -ignoreMinorErrors -execute --- pkgs/by-name/im/immich/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index bb1778ee207f..eb0d2395ab3e 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -23,6 +23,7 @@ imagemagick, libraw, libheif, + perl, vips, }: let @@ -188,8 +189,6 @@ buildNpmPackage' { # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH rm -r node_modules/exiftool-vendored.* - substituteInPlace node_modules/exiftool-vendored/dist/DefaultExifToolOptions.js \ - --replace-fail "checkPerl: !(0, IsWin32_1.isWin32)()," "checkPerl: false," ''; installPhase = '' @@ -212,6 +211,7 @@ buildNpmPackage' { lib.makeBinPath [ exiftool jellyfin-ffmpeg + perl # exiftool-vendored checks for Perl even if exiftool comes from $PATH ] }" From 0bc675c40f5c4aaa07657cdb4cbf6ea903bfc6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 11 Nov 2024 14:16:08 -0800 Subject: [PATCH 2/2] immich-machine-learning: drop superfluous patch --- pkgs/by-name/im/immich-machine-learning/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix index 7d29efca5603..6d46e20d575e 100644 --- a/pkgs/by-name/im/immich-machine-learning/package.nix +++ b/pkgs/by-name/im/immich-machine-learning/package.nix @@ -19,9 +19,6 @@ python.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml --replace-fail 'fastapi-slim' 'fastapi' - - # AttributeError: module 'cv2' has no attribute 'Mat' - substituteInPlace app/test_main.py --replace-fail ": cv2.Mat" "" ''; pythonRelaxDeps = [