From d2bb43f6c969e3c8b4d49c19aca105360dc807d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 18 Jun 2025 21:44:39 +0000 Subject: [PATCH] immich: 1.134.0 -> 1.135.0 Diff: https://github.com/immich-app/immich/compare/v1.134.0...v1.135.0 Changelog: https://github.com/immich-app/immich/releases/tag/v1.135.0 --- pkgs/by-name/im/immich/package.nix | 46 +++-------------------------- pkgs/by-name/im/immich/sources.json | 24 +++++++-------- 2 files changed, 16 insertions(+), 54 deletions(-) diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index b393a1cf95dd..cfbc9db35deb 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -39,62 +39,24 @@ let sources = lib.importJSON sourcesJSON; inherit (sources) version; - esbuild_0_23 = buildPackages.esbuild.override { + esbuild' = buildPackages.esbuild.override { buildGoModule = args: buildPackages.buildGoModule ( args // rec { - version = "0.23.0"; + version = "0.25.5"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; tag = "v${version}"; - hash = "sha256-AH4Y5ELPicAdJZY5CBf2byOxTzOyQFRh4XoqRUQiAQw="; + hash = "sha256-jemGZkWmN1x2+ZzJ5cLp3MoXO0oDKjtZTmZS9Be/TDw="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; } ); }; - esbuild_0_25 = buildPackages.esbuild.override { - buildGoModule = - args: - buildPackages.buildGoModule ( - args - // rec { - version = "0.25.2"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - tag = "v${version}"; - hash = "sha256-aDxheDMeQYqCT9XO3In6RbmzmXVchn+bjgf3nL3VE4I="; - }; - vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; - } - ); - }; - - # Immich server does not actually need esbuild, but react-email and vite do. - # As esbuild doesn't support passing multiple binaries, we use a custom - # "shim", that picks the right version depending on the working directory. - # The correct version can be looked up in package-lock.json - # TODO: There are numerous other env vars this *could* be based on. - esbuildShim = buildPackages.writeShellScriptBin "esbuild" '' - echo "nixpkgs: esbuild shim for '$PWD'" >&2 - case "$PWD" in - "/build/server/node_modules/esbuild") - exec ${lib.getExe esbuild_0_23} "$@" - ;; - "/build/server/node_modules/vite/node_modules/esbuild") - exec ${lib.getExe esbuild_0_25} "$@" - exit 0 - ;; - esac - echo "nixpkgs: Couldn't resolve esbuild version for '$PWD'" >&2 - exit 1 - ''; - buildLock = { sources = builtins.map @@ -263,7 +225,7 @@ buildNpmPackage' { makeCacheWritable = true; env.SHARP_FORCE_GLOBAL_LIBVIPS = 1; - env.ESBUILD_BINARY_PATH = lib.getExe esbuildShim; + env.ESBUILD_BINARY_PATH = lib.getExe esbuild'; preBuild = '' # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index 4204a1ff0843..46d2aca89f8c 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,26 +1,26 @@ { - "version": "1.134.0", - "hash": "sha256-TTHgEQyKx54pFWvCD1FT8KZSO9/EZxULZS97VGTfFcE=", + "version": "1.135.0", + "hash": "sha256-wxdKFuya2GP6lETiG73CYVox/BS+QpgXUjh8ZlVzhrg=", "components": { "cli": { - "npmDepsHash": "sha256-FOtzQF+3yWJI1lzZq79pbPehDFHAsNk5bx71vm1xWBQ=", - "version": "2.2.68" + "npmDepsHash": "sha256-oAtLuOtkzGD9grfamDQEdmfN2VIPuFYmdn51VNP11M8=", + "version": "2.2.69" }, "server": { - "npmDepsHash": "sha256-VzduZY7yMgjoCtTzW5rCooFubJeZuSnkYe9mwmI/n6Q=", - "version": "1.134.0" + "npmDepsHash": "sha256-8G3UKfKp+Wzt7yjM/90omtAZMJ+iOSRQ8lxXiEEDwpM=", + "version": "1.135.0" }, "web": { - "npmDepsHash": "sha256-/T8GZ+kqx/G+9Yn76v2vj+KteoS046d0Cxk58YN+3es=", - "version": "1.134.0" + "npmDepsHash": "sha256-Ej3qCjXXT9oGDQrccoTFpcl1xHMovaLUJi/vRK1nRa4=", + "version": "1.135.0" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-gTS+zrhL4mqT0UOLfzrKFdumtwZPmlQntj+DbCaQ2s8=", - "version": "1.134.0" + "npmDepsHash": "sha256-FCTKMkfl9eBLUmEFg/CYKp8eii+bzh3jujk8A7gtAes=", + "version": "1.135.0" }, "geonames": { - "timestamp": "20250527235755", - "hash": "sha256-vAoQS07EEPkDhrnJGz3iX+sBaPDUHB5uF0a/pr5+zD4=" + "timestamp": "20250618213339", + "hash": "sha256-iO77kJ/rMBu2S7sfu5GAZKRh4OGeR8fT/6Y8mBpgePQ=" } } }