diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index a2c1f6a55864..759925c0e451 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, fetchpatch2, python3, - nodejs_20, + nodejs, node-gyp, runCommand, nixosTests, @@ -27,7 +27,6 @@ vips, }: let - nodejs = nodejs_20; buildNpmPackage' = buildNpmPackage.override { inherit nodejs; }; sources = lib.importJSON ./sources.json; inherit (sources) version; @@ -132,12 +131,12 @@ let node-addon-api = stdenvNoCC.mkDerivation rec { pname = "node-addon-api"; - version = "8.0.0"; + version = "8.3.0"; src = fetchFromGitHub { owner = "nodejs"; repo = "node-addon-api"; tag = "v${version}"; - hash = "sha256-k3v8lK7uaEJvcaj1sucTjFZ6+i5A6w/0Uj9rYlPhjCE="; + hash = "sha256-7KkJkMNX352XnWTOC6mJB+IcFrda20UENcNwoXWDm+s="; }; installPhase = '' mkdir $out @@ -181,7 +180,15 @@ 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; + preBuild = '' + unset SHARP_IGNORE_GLOBAL_LIBVIPS + export SHARP_FORCE_GLOBAL_LIBVIPS=1 + pushd node_modules/sharp mkdir node_modules @@ -205,8 +212,7 @@ buildNpmPackage' { npm prune --omit=dev # remove build artifacts that bloat the closure - rm -r node_modules/bcrypt/{build-tmp-napi-v3,node_modules/node-addon-api,src,test} - rm -r node_modules/msgpackr-extract/build + rm -r node_modules/**/{*.target.mk,binding.Makefile,config.gypi,Makefile,Release/.deps} mkdir -p $out/build mv package.json package-lock.json node_modules dist resources $out/ diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index e21f0c0c1cb7..27ea111b151d 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,26 +1,26 @@ { - "version": "1.123.0", - "hash": "sha256-qzNujf8zRtml57EmyPu0qY0dbswcLhPSHOuGRkSXtVY=", + "version": "1.124.2", + "hash": "sha256-EIp1KH2sNvEiB3wl6m0IiAUyDwBETgKlSXCrIsw73Oo=", "components": { "cli": { - "npmDepsHash": "sha256-L94vKYmNWO3IcJh+ZtJ2EBz6h3G9jeyqyw44tto8bQ0=", - "version": "2.2.37" + "npmDepsHash": "sha256-k3sA4OcjlvzMMI2GsUYks2fIj7LG89H3OX4vTZOCIOo=", + "version": "2.2.40" }, "server": { - "npmDepsHash": "sha256-JUFeaaT4uqyff48nDMrlvC8maU+BjwNU3xcOOR1f8F4=", - "version": "1.123.0" + "npmDepsHash": "sha256-O0XqMOUYy7VdumDDbSenMy22lgZLCDy/GpaSVNs+k4I=", + "version": "1.124.2" }, "web": { - "npmDepsHash": "sha256-eq+VJVBZGVoMgAjdp/F+bu24cHSneAoTWpeft59Gig8=", - "version": "1.123.0" + "npmDepsHash": "sha256-f3p0HT7l3hXFEo+8AvKEn8QvH6KOTMGZOvaOAPxv3Kc=", + "version": "1.124.2" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-n5B0fKRhDTrobT7SGUAMqsWSkHW4pEYRVzlMqAyfJwk=", - "version": "1.123.0" + "npmDepsHash": "sha256-uk4Gfs10TIsbD4VdHt7a9Fub8PcT6R8ksfvnOLFs/Zo=", + "version": "1.124.2" }, "geonames": { - "timestamp": "20241217171200", - "hash": "sha256-A21TooXLWSmCW4NaYq+2juaNlAmzTT76ZwtF5NcJcLU=" + "timestamp": "20250108222614", + "hash": "sha256-gCi0iFQplv4XizDi9DYEVekFFe46DM4X2YiPSe7ugR4=" } } }