diff --git a/pkgs/build-support/teleport/default.nix b/pkgs/build-support/teleport/default.nix index c1b180f13966..1dfeb063abe3 100644 --- a/pkgs/build-support/teleport/default.nix +++ b/pkgs/build-support/teleport/default.nix @@ -10,7 +10,7 @@ nodejs, openssl, pkg-config, - pnpm_10, + pnpm_10_29_2, fetchPnpmDeps, pnpmConfigHook, rustc, @@ -81,7 +81,7 @@ let pname version ; - pnpm = pnpm_10; + pnpm = pnpm_10_29_2; fetcherVersion = 2; hash = pnpmHash; }; @@ -91,7 +91,7 @@ let cargo nodejs pnpmConfigHook - pnpm_10 + pnpm_10_29_2 rustc rustc.llvmPackages.lld rustPlatform.cargoSetupHook diff --git a/pkgs/by-name/e-/e-search/package.nix b/pkgs/by-name/e-/e-search/package.nix index 951cc856cb65..4973b63580db 100644 --- a/pkgs/by-name/e-/e-search/package.nix +++ b/pkgs/by-name/e-/e-search/package.nix @@ -9,7 +9,7 @@ gobject-introspection, makeWrapper, nodejs_20, - pnpm_10, + pnpm_10_29_2, fetchPnpmDeps, pnpmConfigHook, electron, @@ -37,7 +37,7 @@ }: let - pnpm' = pnpm_10.override { nodejs = nodejs_20; }; + pnpm' = pnpm_10_29_2.override { nodejs = nodejs_20; }; eSearch-OCR-ch = fetchzip { url = "https://github.com/xushengfeng/eSearch-OCR/releases/download/4.0.0/ch.zip"; hash = "sha256-0NCXuy8k9/AdpK4ie49S8032u37gNhX6Jc6bOGufrV4="; diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index 0b319f7449c9..1433abc515ea 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -8,7 +8,7 @@ mpv-unwrapped, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10_29_2, darwin, copyDesktopItems, makeDesktopItem, @@ -41,6 +41,7 @@ buildNpmPackage { version src ; + pnpm = pnpm_10_29_2; fetcherVersion = 3; hash = "sha256-LeoOksMWZjhVkEjTn5sS2xuX3QxGX8O7iC/3suVwiug="; }; @@ -48,7 +49,7 @@ buildNpmPackage { env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; nativeBuildInputs = [ - pnpm + pnpm_10_29_2 ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ copyDesktopItems ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.autoSignDarwinBinariesHook ]; diff --git a/pkgs/by-name/fo/folo/package.nix b/pkgs/by-name/fo/folo/package.nix index 56385c1c24be..c48cb706ac23 100644 --- a/pkgs/by-name/fo/folo/package.nix +++ b/pkgs/by-name/fo/folo/package.nix @@ -6,7 +6,7 @@ makeDesktopItem, makeWrapper, nodejs, - pnpm_10, + pnpm_10_29_2, fetchPnpmDeps, pnpmConfigHook, stdenv, @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_10 + pnpm_10_29_2 makeWrapper imagemagick ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { version src ; - pnpm = pnpm_10; + pnpm = pnpm_10_29_2; fetcherVersion = 3; hash = "sha256-EP7bpbJUcKmHm7KMlKc0Fz2u0niQ3jC7YN/9pp7vucE="; }; diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index 3aab70fbac23..b2ae1005fc07 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - pnpm_10, + pnpm_10_29_2, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_10 + pnpm_10_29_2 copyDesktopItems imagemagick makeWrapper @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_10; + pnpm = pnpm_10_29_2; fetcherVersion = 2; hash = "sha256-uK3CNyPewUVAmqBJq1WMCrNeMP5I18BEBkZIBP0qPsI="; }; diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix index 24bd10a53ad1..4e15de84522e 100644 --- a/pkgs/by-name/he/heroic-unwrapped/package.nix +++ b/pkgs/by-name/he/heroic-unwrapped/package.nix @@ -4,7 +4,7 @@ stdenv, fetchFromGitHub, # Pinned, because our FODs are not guaranteed to be stable between major versions. - pnpm_10, + pnpm_10_29_2, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -21,7 +21,7 @@ }: let - pnpm = pnpm_10; + pnpm = pnpm_10_29_2; electron = electron_39; legendary = callPackage ./legendary.nix { }; diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index 7fe9bea8c55e..7f16dc953abd 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10_29_2, nodejs, electron, makeWrapper, @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pnpmConfigHook - pnpm + pnpm_10_29_2 nodejs # we use a script wrapper here for environment variable expansion at runtime # https://github.com/NixOS/nixpkgs/issues/172583 @@ -47,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + pnpm = pnpm_10_29_2; fetcherVersion = 3; hash = "sha256-MgUOOr188t+t/4sTXVpbr+xYT/1qf7/B0ZG0w+QkVxc="; }; diff --git a/pkgs/by-name/pe/pear-desktop/package.nix b/pkgs/by-name/pe/pear-desktop/package.nix index 347ac7a1b02d..6be7ed05d005 100644 --- a/pkgs/by-name/pe/pear-desktop/package.nix +++ b/pkgs/by-name/pe/pear-desktop/package.nix @@ -7,7 +7,7 @@ python3, copyDesktopItems, nodejs, - pnpm_10, + pnpm_10_29_2, fetchPnpmDeps, pnpmConfigHook, makeDesktopItem, @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_10; + pnpm = pnpm_10_29_2; fetcherVersion = 2; hash = "sha256-xZQ8rnLGD0ZxxUUPLHmNJ6mA+lnUHCTBvtJTiIPxaZU="; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { python3 nodejs pnpmConfigHook - pnpm_10 + pnpm_10_29_2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ]; diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix index 3ff7d7425ec6..07c668f7b55c 100644 --- a/pkgs/by-name/po/podman-desktop/package.nix +++ b/pkgs/by-name/po/podman-desktop/package.nix @@ -6,7 +6,7 @@ copyDesktopItems, electron_39, nodejs, - pnpm_10, + pnpm_10_29_2, fetchPnpmDeps, pnpmConfigHook, makeDesktopItem, @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_10; + pnpm = pnpm_10_29_2; fetcherVersion = 2; hash = "sha256-nBjAmXzjR0qGCM91UAonQKP0NG7+DXImueSbhbnMK/k="; }; @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { makeBinaryWrapper nodejs pnpmConfigHook - pnpm_10 + pnpm_10_29_2 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index c31fc54d4929..20b8145c2c6e 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -2,7 +2,7 @@ stdenv, lib, nodejs_24, - pnpm_10, + pnpm_10_29_2, fetchPnpmDeps, pnpmConfigHook, electron_40, @@ -25,7 +25,7 @@ }: let nodejs = nodejs_24; - pnpm = pnpm_10; + pnpm = pnpm_10_29_2; electron = electron_40; libsignal-node = callPackage ./libsignal-node.nix { inherit nodejs; }; diff --git a/pkgs/by-name/sp/splayer/package.nix b/pkgs/by-name/sp/splayer/package.nix index 200b68c320ff..233952567431 100644 --- a/pkgs/by-name/sp/splayer/package.nix +++ b/pkgs/by-name/sp/splayer/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - pnpm_10, + pnpm_10_29_2, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { version src ; - pnpm = pnpm_10; + pnpm = pnpm_10_29_2; fetcherVersion = 2; hash = "sha256-PTfZopse+9RS7qh0miLu3duYlWDfifZS254tZKqgxKk="; }; @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pnpmConfigHook - pnpm_10 + pnpm_10_29_2 nodejs rustPlatform.cargoSetupHook cargo diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 02c902c4a8b5..bed9156bf587 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -13,7 +13,7 @@ pipewire, libpulseaudio, autoPatchelfHook, - pnpm_10, + pnpm_10_29_2, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { src patches ; - pnpm = pnpm_10; + pnpm = pnpm_10_29_2; fetcherVersion = 2; hash = "sha256-o9dxtqXfCKTQpvNrbD/h0F3Hh39TEEA1qqYA9tN3j5I="; }; @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_10 + pnpm_10_29_2 jq ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/vi/vikunja-desktop/package.nix b/pkgs/by-name/vi/vikunja-desktop/package.nix index e7a0985d9496..658e44a14d11 100644 --- a/pkgs/by-name/vi/vikunja-desktop/package.nix +++ b/pkgs/by-name/vi/vikunja-desktop/package.nix @@ -3,7 +3,7 @@ stdenv, makeWrapper, makeDesktopItem, - pnpm, + pnpm_10_29_2, pnpmConfigHook, nodejs, electron, @@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot pnpmInstallFlags ; + pnpm = pnpm_10_29_2; fetcherVersion = 1; hash = "sha256-yiVlEr1gi2g3m+hkYfDv6qd/wRlwwknM6lAaIeR58Ok="; }; @@ -50,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper nodejs - pnpm + pnpm_10_29_2 pnpmConfigHook vikunja.passthru.frontend ]; diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix index 07e9c5424849..d66f71f8c894 100644 --- a/pkgs/by-name/vi/vikunja/package.nix +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, stdenv, nodejs_24, - pnpm_10, + pnpm_10_29_2, fetchPnpmDeps, pnpmConfigHook, buildGoModule, @@ -35,7 +35,7 @@ let src sourceRoot ; - pnpm = pnpm_10; + pnpm = pnpm_10_29_2; fetcherVersion = 1; hash = "sha256-oY8DXJFFwLBjUno3EithLhmnA8hTksq4xgMSSOGtwuo="; }; @@ -44,7 +44,7 @@ let nodejs_24 dart-sass pnpmConfigHook - pnpm_10 + pnpm_10_29_2 ]; doCheck = true; diff --git a/pkgs/by-name/vo/voicevox/package.nix b/pkgs/by-name/vo/voicevox/package.nix index be05fd058311..eec83720f5bd 100644 --- a/pkgs/by-name/vo/voicevox/package.nix +++ b/pkgs/by-name/vo/voicevox/package.nix @@ -13,7 +13,7 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10_29_2, _7zz, electron, @@ -58,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch ; + pnpm = pnpm_10_29_2; + # let's just be safe and add these explicitly to nativeBuildInputs # even though the fetcher already uses them in its implementation nativeBuildInputs = [ @@ -76,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { moreutils nodejs pnpmConfigHook - pnpm + pnpm_10_29_2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems diff --git a/pkgs/by-name/zu/zulip/package.nix b/pkgs/by-name/zu/zulip/package.nix index b52ae9fb3910..34657eefa06b 100644 --- a/pkgs/by-name/zu/zulip/package.nix +++ b/pkgs/by-name/zu/zulip/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchPnpmDeps, nodejs, - pnpm_10, + pnpm_10_29_2, pnpmConfigHook, python3, electron_39, @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_10; + pnpm = pnpm_10_29_2; fetcherVersion = 3; hash = "sha256-s/KllzT46L2o4SWS3z3Z7FDQD6FEEEAnPdM6tsfGRUo="; }; nativeBuildInputs = [ nodejs - pnpm_10 + pnpm_10_29_2 pnpmConfigHook makeBinaryWrapper copyDesktopItems diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 448f57e30562..de952551a1a1 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -14,10 +14,17 @@ let version = "9.15.9"; hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc="; }; - "10" = { + # 10.29.3 made a breaking change: https://github.com/pnpm/pnpm/issues/10601. + # Pnpm packages that depend on electron builder must be upgraded to 26.8.2 or newer + # otherwise a runtime error will occur when launching the application. + "10_29_2" = { version = "10.29.2"; hash = "sha256-hAL2daH0zJ1PJ7v6s1wtSi4dfrATHfA9rQlhnoZnTQw="; }; + "10" = { + version = "10.30.3"; + hash = "sha256-/wpyFA9qbWbAsoT2yVYK/2BVGOKMKa6sJfsmK3QzFYg="; + }; }; callPnpm = variant: callPackage ./generic.nix { inherit (variant) version hash; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b93e1ced5053..c85ac4ed6fb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3258,6 +3258,7 @@ with pkgs; inherit (callPackage ../development/tools/pnpm { }) pnpm_8 pnpm_9 + pnpm_10_29_2 pnpm_10 ; pnpm = pnpm_10;