From f65d36693a360d31b6d662a9d2d73efc24625135 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.2 Diff: https://github.com/immich-app/immich/compare/refs/tags/v1.124.2...v1.125.2 Changelog: https://github.com/immich-app/immich/releases/tag/v1.125.1 https://github.com/immich-app/immich/releases/tag/v1.125.2 --- pkgs/by-name/im/immich/package.nix | 36 +---------------------------- pkgs/by-name/im/immich/sources.json | 24 +++++++++---------- 2 files changed, 13 insertions(+), 47 deletions(-) diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 759925c0e451..06839ba36e60 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 27ea111b151d..6935c5e9fa5c 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,26 +1,26 @@ { - "version": "1.124.2", - "hash": "sha256-EIp1KH2sNvEiB3wl6m0IiAUyDwBETgKlSXCrIsw73Oo=", + "version": "1.125.2", + "hash": "sha256-vtEUMERvCibOKYlHtu8eTQX6LLAMF5riBs2feX8HCAU=", "components": { "cli": { - "npmDepsHash": "sha256-k3sA4OcjlvzMMI2GsUYks2fIj7LG89H3OX4vTZOCIOo=", - "version": "2.2.40" + "npmDepsHash": "sha256-wHxNmmZVWuOYueEgkSGokwVZ20DklrjTyLYyamLzPvk=", + "version": "2.2.43" }, "server": { - "npmDepsHash": "sha256-O0XqMOUYy7VdumDDbSenMy22lgZLCDy/GpaSVNs+k4I=", - "version": "1.124.2" + "npmDepsHash": "sha256-0zcEiQM2KDrpLVv/uybcis9ohtyB5LcbZhvlXSMVRg0=", + "version": "1.125.2" }, "web": { - "npmDepsHash": "sha256-f3p0HT7l3hXFEo+8AvKEn8QvH6KOTMGZOvaOAPxv3Kc=", - "version": "1.124.2" + "npmDepsHash": "sha256-dTkRTxFhIeXhIkc87pERTCXtEoipiDA6C5RdlQ6Dvo8=", + "version": "1.125.2" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-uk4Gfs10TIsbD4VdHt7a9Fub8PcT6R8ksfvnOLFs/Zo=", - "version": "1.124.2" + "npmDepsHash": "sha256-uBzPhxITGzEnKrcATzTQeIwjKpAE8Y0xoJdC5dm6cZo=", + "version": "1.125.2" }, "geonames": { - "timestamp": "20250108222614", - "hash": "sha256-gCi0iFQplv4XizDi9DYEVekFFe46DM4X2YiPSe7ugR4=" + "timestamp": "20250124195258", + "hash": "sha256-2m+0M6200SixTFVZ1V7ZFw8D4E9VYhbmOto0RqWQPsQ=" } } }