diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix index 4222b52515e5..c5820049c215 100644 --- a/nixos/modules/services/web-apps/immich.nix +++ b/nixos/modules/services/web-apps/immich.nix @@ -258,7 +258,7 @@ in postgresEnv // redisEnv // { - HOST = cfg.host; + IMMICH_HOST = cfg.host; IMMICH_PORT = toString cfg.port; IMMICH_MEDIA_LOCATION = cfg.mediaLocation; IMMICH_MACHINE_LEARNING_URL = "http://localhost:3003"; diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix index 1029055a3b0f..c42e1b6009bd 100644 --- a/pkgs/by-name/im/immich-machine-learning/package.nix +++ b/pkgs/by-name/im/immich-machine-learning/package.nix @@ -88,11 +88,9 @@ python.pkgs.buildPythonApplication rec { }; meta = { - description = "Self-hosted photo and video backup solution (machine learning component)"; - homepage = "https://immich.app/"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ jvanbruegge ]; + description = "${immich.meta.description} (machine learning component)"; + homepage = "https://github.com/immich-app/immich/tree/main/machine-learning"; mainProgram = "machine-learning"; - inherit (immich.meta) platforms; + inherit (immich.meta) license maintainers platforms; }; } diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index fcbfb2607f02..66213718fd23 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -17,7 +17,7 @@ cacert, unzip, # runtime deps - ffmpeg-headless, + jellyfin-ffmpeg, imagemagick, libraw, libheif, @@ -101,8 +101,8 @@ let web = buildNpmPackage' { pname = "immich-web"; - inherit version; - src = "${src}/web"; + inherit version src; + sourceRoot = "${src.name}/web"; inherit (sources.components.web) npmDepsHash; preBuild = '' @@ -155,7 +155,7 @@ buildNpmPackage' { ]; buildInputs = [ - ffmpeg-headless + jellyfin-ffmpeg imagemagick libraw libheif @@ -198,7 +198,7 @@ buildNpmPackage' { --suffix PATH : "${ lib.makeBinPath [ perl - ffmpeg-headless + jellyfin-ffmpeg ] }" diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index b39c08613c49..27044f2a25f4 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,22 +1,22 @@ { - "version": "1.118.2", - "hash": "sha256-u2/Xs1SdAzmQ02pyXD9+ncamIKFcq8qMijnx7KFtrmU=", + "version": "1.119.0", + "hash": "sha256-mflVxz+Pxv7xS4onsjRQ1lMZ43U/rkuqO6vPRon7Gms=", "components": { "cli": { - "npmDepsHash": "sha256-RwfGq0fDPYo+ZP2xv+sMKmr3Tf8szbB8506c1PqiMM0=", - "version": "2.2.26" + "npmDepsHash": "sha256-QClG/WQK2MbVKuR0Wk9+TdSTAbemtFeg7GkKjvEjC4c=", + "version": "2.2.27" }, "server": { - "npmDepsHash": "sha256-4jPvLCsI2gz+maBU3ZtrWZzJ6Zp2PTQwaCuCKr1hK/o=", - "version": "1.118.2" + "npmDepsHash": "sha256-9mMnOiKsTTO4PJUKYN668yjIELeFUgdqSx6Gf87UYVU=", + "version": "1.119.0" }, "web": { - "npmDepsHash": "sha256-j6+EkcfwpaCP048v/kZv1xthp0DSylraJTeU4+LcDbw=", - "version": "1.118.2" + "npmDepsHash": "sha256-ieTGMywR26msYqmQOK/q/l3O6/Vkmu0TLFn956kK/xE=", + "version": "1.119.0" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-e+7BEFc46scLZDqCJNRhrczOEydSoiK9m7vSj/2ECaE=", - "version": "1.118.2" + "npmDepsHash": "sha256-NLvuHTVWuzv5G0ONu3S3K8AgyliTZowYQN0fzYhWtUQ=", + "version": "1.119.0" } } }