From 1e5c3753258332d249af0e350be09816b6264303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 Sep 2024 15:59:44 -0700 Subject: [PATCH 1/2] immich-machine-learning: only add run time dependencies to PYTHONPATH --- pkgs/by-name/im/immich-machine-learning/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix index 5b35ecfaea04..603c37886cf1 100644 --- a/pkgs/by-name/im/immich-machine-learning/package.nix +++ b/pkgs/by-name/im/immich-machine-learning/package.nix @@ -27,7 +27,7 @@ let }; }; in -python.pkgs.buildPythonApplication { +python.pkgs.buildPythonApplication rec { pname = "immich-machine-learning"; inherit (immich) version; src = "${immich.src}/machine-learning"; @@ -83,7 +83,7 @@ python.pkgs.buildPythonApplication { cp -r ann $out/${python.sitePackages}/ makeWrapper ${lib.getExe python.pkgs.gunicorn} "''${!outputBin}"/bin/machine-learning \ - --prefix PYTHONPATH : "$out/${python.sitePackages}:$PYTHONPATH" \ + --prefix PYTHONPATH : "$out/${python.sitePackages}:${python.pkgs.makePythonPath dependencies}" \ --set-default MACHINE_LEARNING_WORKERS 1 \ --set-default MACHINE_LEARNING_WORKER_TIMEOUT 120 \ --set-default MACHINE_LEARNING_CACHE_FOLDER /var/cache/immich \ From a394d78f618b740e11e0f61ceaafd814560a3a44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 28 Sep 2024 16:02:29 -0700 Subject: [PATCH 2/2] immich-machine-learning: add passthru.tests --- pkgs/by-name/im/immich-machine-learning/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix index 603c37886cf1..1a7255dd91ff 100644 --- a/pkgs/by-name/im/immich-machine-learning/package.nix +++ b/pkgs/by-name/im/immich-machine-learning/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, immich, python3, + nixosTests, }: let python = python3.override { @@ -96,6 +97,10 @@ python.pkgs.buildPythonApplication rec { --log-config-json $out/share/immich/log_conf.json" ''; + passthru.tests = { + inherit (nixosTests) immich; + }; + meta = { description = "Self-hosted photo and video backup solution (machine learning component)"; homepage = "https://immich.app/";