From 0c6e080ea629c8efe263a3615a3b3a1f09c852cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 23 Jan 2025 10:25:20 -0800 Subject: [PATCH] immich: 1.124.2 -> 1.125.1 Diff: https://github.com/immich-app/immich/compare/refs/tags/v1.124.2...v1.125.1 Changelog: https://github.com/immich-app/immich/releases/tag/v1.125.1 --- pkgs/by-name/im/immich/package.nix | 36 +---------------------------- pkgs/by-name/im/immich/sources.json | 20 ++++++++-------- 2 files changed, 11 insertions(+), 45 deletions(-) diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 759925c0e4510..06839ba36e602 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -1,6 +1,5 @@ { lib, - stdenvNoCC, buildNpmPackage, fetchFromGitHub, fetchpatch2, @@ -129,21 +128,6 @@ let ''; }; - node-addon-api = stdenvNoCC.mkDerivation rec { - pname = "node-addon-api"; - version = "8.3.0"; - src = fetchFromGitHub { - owner = "nodejs"; - repo = "node-addon-api"; - tag = "v${version}"; - hash = "sha256-7KkJkMNX352XnWTOC6mJB+IcFrda20UENcNwoXWDm+s="; - }; - installPhase = '' - mkdir $out - cp -r *.c *.h *.gyp *.gypi index.js package-support.json package.json tools $out/ - ''; - }; - vips' = vips.overrideAttrs (prev: { mesonFlags = prev.mesonFlags ++ [ "-Dtiff=disabled" ]; }); @@ -180,27 +164,9 @@ buildNpmPackage' { # Required because vips tries to write to the cache dir makeCacheWritable = true; - # we manually build sharp from source later on - # FIXME figure out why otherwise it fails with - # error: 'NewOrCopy' is not a member of 'Napi::Buffer' - env.SHARP_IGNORE_GLOBAL_LIBVIPS = 1; + env.SHARP_FORCE_GLOBAL_LIBVIPS = 1; preBuild = '' - unset SHARP_IGNORE_GLOBAL_LIBVIPS - export SHARP_FORCE_GLOBAL_LIBVIPS=1 - - pushd node_modules/sharp - - mkdir node_modules - ln -s ${node-addon-api} node_modules/node-addon-api - - node install/check - - rm -r node_modules - - popd - rm -r node_modules/@img/sharp* - # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH rm -r node_modules/exiftool-vendored.* ''; diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index 27ea111b151dc..eb41054b8079f 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,22 +1,22 @@ { - "version": "1.124.2", - "hash": "sha256-EIp1KH2sNvEiB3wl6m0IiAUyDwBETgKlSXCrIsw73Oo=", + "version": "1.125.1", + "hash": "sha256-1yhKZSl/aI8MVBtng7qG4ZsDBbIUWCksMeOhBJHvS94=", "components": { "cli": { - "npmDepsHash": "sha256-k3sA4OcjlvzMMI2GsUYks2fIj7LG89H3OX4vTZOCIOo=", - "version": "2.2.40" + "npmDepsHash": "sha256-vFGCTTRum0asLvA92/d7msIv+eLmxbPq+6oX+o+x6fE=", + "version": "2.2.42" }, "server": { - "npmDepsHash": "sha256-O0XqMOUYy7VdumDDbSenMy22lgZLCDy/GpaSVNs+k4I=", - "version": "1.124.2" + "npmDepsHash": "sha256-XlLC2Wo0KNhJGSZWFshUImVVPhHB4ae2AgebIojTvwc=", + "version": "1.125.1" }, "web": { - "npmDepsHash": "sha256-f3p0HT7l3hXFEo+8AvKEn8QvH6KOTMGZOvaOAPxv3Kc=", - "version": "1.124.2" + "npmDepsHash": "sha256-5g+RSQtTRAXJyvi763Qf/YFOAHsOekQ3em5BnPETTM4=", + "version": "1.125.1" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-uk4Gfs10TIsbD4VdHt7a9Fub8PcT6R8ksfvnOLFs/Zo=", - "version": "1.124.2" + "npmDepsHash": "sha256-RGsRCbx1IGFX7T3owMg4pN03Eh6qdJBXVmxFFPxRNAc=", + "version": "1.125.1" }, "geonames": { "timestamp": "20250108222614",