From b38437e5e9c64a22068413eb461d14baea587bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 15 Jan 2025 10:51:30 +0100 Subject: [PATCH] pnpm: pin pnpm to pnpm_9 --- .../virtualization/podman-desktop/default.nix | 4 ++-- pkgs/by-name/as/astro-language-server/package.nix | 14 +++++++------- pkgs/by-name/cl/clash-verge-rev/webui.nix | 6 +++--- pkgs/by-name/da/daed/package.nix | 6 +++--- pkgs/by-name/fl/flood/package.nix | 6 +++--- pkgs/by-name/fo/follow/package.nix | 6 +++--- pkgs/by-name/gu/gui-for-clash/package.nix | 6 +++--- pkgs/by-name/gu/gui-for-singbox/package.nix | 6 +++--- pkgs/by-name/ho/homebox/package.nix | 8 ++++---- pkgs/by-name/le/legcord/package.nix | 6 +++--- pkgs/by-name/me/metacubexd/package.nix | 6 +++--- pkgs/by-name/mi/misskey/package.nix | 10 +++++----- pkgs/by-name/n8/n8n/package.nix | 6 +++--- pkgs/by-name/ov/overlayed/webui.nix | 6 +++--- pkgs/by-name/pg/pgrok/package.nix | 6 +++--- pkgs/by-name/rs/rsshub/package.nix | 6 +++--- pkgs/by-name/sk/sketchybar-app-font/package.nix | 6 +++--- pkgs/by-name/su/surrealist/package.nix | 6 +++--- pkgs/by-name/ta/tabby-agent/package.nix | 6 +++--- pkgs/by-name/ta/taler-wallet-core/package.nix | 6 +++--- pkgs/by-name/ve/vencord/package.nix | 6 +++--- pkgs/by-name/we/wealthfolio/package.nix | 6 +++--- pkgs/games/heroic/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 24 files changed, 76 insertions(+), 76 deletions(-) diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index 947def308f7ab3..635c55b32ca889 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-07lf9jy22JUT+Vc5y9Tu1nkWaXU5RTdu3GibcvQsSs8="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-LPsNRd1c/cQeyBn3LZKnKeAsZ981sOkLYTnXIZL82LA="; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; nativeBuildInputs = [ - makeWrapper nodejs pnpm.configHook + makeWrapper nodejs pnpm_9.configHook ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix index 4efdc6e54719dd..396281fcead291 100644 --- a/pkgs/by-name/as/astro-language-server/package.nix +++ b/pkgs/by-name/as/astro-language-server/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - pnpm, + pnpm_9, nodejs_22, }: @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-NBLUeg1WqxTXtu8eg1fihQSfm8koYAEWhfXAj/fIdC8="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version @@ -30,24 +30,24 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs_22 - pnpm.configHook + pnpm_9.configHook ]; buildInputs = [ nodejs_22 ]; # Must specify to download "@astrojs/yaml2ts" depencendies - # https://pnpm.io/filtering#--filter-package_name-1 + # https://pnpm_9.io/filtering#--filter-package_name-1 pnpmWorkspaces = [ "@astrojs/language-server..." ]; prePnpmInstall = '' - # Warning section for "pnpm@v8" - # https://pnpm.io/cli/install#--filter-package_selector + # Warning section for "pnpm_9@v8" + # https://pnpm_9.io/cli/install#--filter-package_selector pnpm config set dedupe-peer-dependents false ''; buildPhase = '' runHook preBuild - # Must build the "@astrojs/yaml2ts" package. Dependency is linked via workspace by "pnpm" + # Must build the "@astrojs/yaml2ts" package. Dependency is linked via workspace by "pnpm_9" # (https://github.com/withastro/language-tools/blob/%40astrojs/language-server%402.14.2/pnpm-lock.yaml#L78-L80) pnpm --filter "@astrojs/language-server..." build diff --git a/pkgs/by-name/cl/clash-verge-rev/webui.nix b/pkgs/by-name/cl/clash-verge-rev/webui.nix index 792fbc5be8b810..abad70b62859ca 100644 --- a/pkgs/by-name/cl/clash-verge-rev/webui.nix +++ b/pkgs/by-name/cl/clash-verge-rev/webui.nix @@ -2,7 +2,7 @@ version, src, pname, - pnpm, + pnpm_9, nodejs, stdenv, meta, @@ -10,14 +10,14 @@ stdenv.mkDerivation { inherit version src meta; pname = "${pname}-webui"; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-ZKDhBdVyLIPf7CQaYUvj9dJd3lA3zsqroSjTyvOmunQ="; }; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; postPatch = '' diff --git a/pkgs/by-name/da/daed/package.nix b/pkgs/by-name/da/daed/package.nix index 8618a3212fb244..55b0597b55271c 100644 --- a/pkgs/by-name/da/daed/package.nix +++ b/pkgs/by-name/da/daed/package.nix @@ -1,5 +1,5 @@ { - pnpm, + pnpm_9, nodejs, stdenv, clang, @@ -22,14 +22,14 @@ let web = stdenv.mkDerivation { inherit pname version src; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-vqkiZzd5WOeJem0zUyMsJd6/aHHAjlsIQMkNf+SUvHY="; }; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; buildPhase = '' diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix index 7e8dd89694fb62..26fd8b7a29e1c4 100644 --- a/pkgs/by-name/fl/flood/package.nix +++ b/pkgs/by-name/fl/flood/package.nix @@ -2,7 +2,7 @@ , buildNpmPackage , fetchFromGitHub , nixosTests -, pnpm +, pnpm_9 , nix-update-script }: @@ -17,9 +17,9 @@ buildNpmPackage rec { hash = "sha256-lm+vPo7V99OSUAVEvdiTNMlD/+iHGPIyPLc1WzO1aTU="; }; - npmConfigHook = pnpm.configHook; + npmConfigHook = pnpm_9.configHook; npmDeps = pnpmDeps; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-NuU9O3bEboxmuEuk1WSUeZRNgVK5cwFiUAN3+7vACGw="; }; diff --git a/pkgs/by-name/fo/follow/package.nix b/pkgs/by-name/fo/follow/package.nix index e59bc1015a0766..51a61d4028cd55 100644 --- a/pkgs/by-name/fo/follow/package.nix +++ b/pkgs/by-name/fo/follow/package.nix @@ -6,7 +6,7 @@ makeDesktopItem, makeWrapper, nodejs, - pnpm, + pnpm_9, stdenv, }: stdenv.mkDerivation rec { @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook makeWrapper imagemagick ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-FzMjN0rIjYxexf6tix4qi3mnuPkadjKihhN0Pj5y2nU="; }; diff --git a/pkgs/by-name/gu/gui-for-clash/package.nix b/pkgs/by-name/gu/gui-for-clash/package.nix index b4c5263a5d6db5..bf8cdc65ffe0b6 100644 --- a/pkgs/by-name/gu/gui-for-clash/package.nix +++ b/pkgs/by-name/gu/gui-for-clash/package.nix @@ -1,7 +1,7 @@ { stdenv, nodejs, - pnpm, + pnpm_9, fetchFromGitHub, buildGoModule, lib, @@ -28,10 +28,10 @@ let nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/frontend"; hash = "sha256-RQtU61H1YklCgJrlyHALxUZp8OvVs2MgFThWBsYk2cs="; diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix index 9531875fb41818..e8d77c045d821a 100644 --- a/pkgs/by-name/gu/gui-for-singbox/package.nix +++ b/pkgs/by-name/gu/gui-for-singbox/package.nix @@ -1,7 +1,7 @@ { stdenv, nodejs, - pnpm, + pnpm_9, fetchFromGitHub, buildGoModule, lib, @@ -28,10 +28,10 @@ let nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/frontend"; hash = "sha256-bAgyGZLmEr8tMunoeQHl+B2IDGr4Gw3by1lC811lqio="; diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index 3cfdf1b20f29e0..4818f219a2904f 100644 --- a/pkgs/by-name/ho/homebox/package.nix +++ b/pkgs/by-name/ho/homebox/package.nix @@ -2,7 +2,7 @@ lib, buildGo123Module, fetchFromGitHub, - pnpm, + pnpm_9, nodejs, go_1_23, git, @@ -35,7 +35,7 @@ buildGo123Module { preBuild = ""; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version; src = "${src}/frontend"; hash = "sha256-x7sWSH84UJEXNRLCgEgXc4NrTRsn6OplANi+XGtIN9Y="; @@ -56,8 +56,8 @@ buildGo123Module { ''; nativeBuildInputs = [ - pnpm - pnpm.configHook + pnpm_9 + pnpm_9.configHook nodejs ]; diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index f75c41802e5735..dc5e5f554e6bac 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - pnpm, + pnpm_9, nodejs, electron_32, makeWrapper, @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pnpm.configHook + pnpm_9.configHook nodejs makeWrapper copyDesktopItems ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-QTePf/QE85OzXIcnwLJsCJJyRxwoV+FNef2Z9nAt35E="; }; diff --git a/pkgs/by-name/me/metacubexd/package.nix b/pkgs/by-name/me/metacubexd/package.nix index 85b7083f15b977..a9680d6bb90521 100644 --- a/pkgs/by-name/me/metacubexd/package.nix +++ b/pkgs/by-name/me/metacubexd/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, nix-update-script, nodejs, - pnpm, + pnpm_9, stdenv, }: stdenv.mkDerivation (finalAttrs: { @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - pnpm.configHook + pnpm_9.configHook nodejs ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-OFcXsAFMwY6BnyEVK9Px1g17CHCQWyPpr1My7u3XPpU="; }; diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index f0cd676133132c..05f8ba5e33a4dd 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -4,7 +4,7 @@ nixosTests, fetchFromGitHub, nodejs, - pnpm, + pnpm_9, makeWrapper, python3, bash, @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook makeWrapper python3 ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun ]; # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-YWZhm5eKjB6JGP45WC3UrIkr7vuBUI4Q3oiK8Lst3dI="; }; @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { # Otherwise, maybe somehow bindmount a writable directory into /data/files. ln -s /var/lib/misskey $out/data/files - makeWrapper ${pnpm}/bin/pnpm $out/bin/misskey \ + makeWrapper ${pnpm_9}/bin/pnpm $out/bin/misskey \ --run "${checkEnvVarScript} || exit" \ --chdir $out/data \ --add-flags run \ @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix PATH : ${ lib.makeBinPath [ nodejs - pnpm + pnpm_9 bash ] } \ diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 29dfa2a7f7f631..12b756397691a0 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -4,7 +4,7 @@ nixosTests, fetchFromGitHub, nodejs, - pnpm, + pnpm_9, python3, node-gyp, cacert, @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-3fGsghGzqLb9B0qrqPuJV2pypd3kJVUrYohMe9quqG4="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-n+A7SGfjzvB9NOt8kqi7DswKSjCTef5SJItWtFzNpwA="; }; nativeBuildInputs = [ - pnpm.configHook + pnpm_9.configHook python3 # required to build sqlite3 bindings node-gyp # required to build sqlite3 bindings cacert # required for rustls-native-certs (dependency of turbo build tool) diff --git a/pkgs/by-name/ov/overlayed/webui.nix b/pkgs/by-name/ov/overlayed/webui.nix index 085b3436a9ca73..482aeba5f2f4f5 100644 --- a/pkgs/by-name/ov/overlayed/webui.nix +++ b/pkgs/by-name/ov/overlayed/webui.nix @@ -4,21 +4,21 @@ version, stdenv, nodejs, - pnpm, + pnpm_9, }: stdenv.mkDerivation (finalAttrs: { inherit version src meta; pname = "overlayed-webui"; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) src pname version; hash = "sha256-+yyxoodcDfqJ2pkosd6sMk77/71RDsGthedo1Oigwto="; }; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; buildPhase = '' diff --git a/pkgs/by-name/pg/pgrok/package.nix b/pkgs/by-name/pg/pgrok/package.nix index 360aeea5561923..675d7a0bb50afd 100644 --- a/pkgs/by-name/pg/pgrok/package.nix +++ b/pkgs/by-name/pg/pgrok/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, nix-update-script, nodejs, - pnpm, + pnpm_9, }: let @@ -28,10 +28,10 @@ buildGoModule { nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-xObDEkNGMXcUqX9thAJoE45yzd7f15k2odDWv9X3RRE="; }; diff --git a/pkgs/by-name/rs/rsshub/package.nix b/pkgs/by-name/rs/rsshub/package.nix index 147c0bbb680d48..38ad570f53c2bd 100644 --- a/pkgs/by-name/rs/rsshub/package.nix +++ b/pkgs/by-name/rs/rsshub/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, makeBinaryWrapper, nodejs, - pnpm, + pnpm_9, replaceVars, stdenv, }: @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-mAAo4SdJ8cj8aqnbm+azcnxq8lFBvOy3BlSEKz9MA0Q="; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeBinaryWrapper nodejs - pnpm.configHook + pnpm_9.configHook ]; buildPhase = '' diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index b82123b36639f9..748ff1c2209213 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, lib, - pnpm, + pnpm_9, stdenvNoCC, nodejs, nix-update-script, @@ -18,14 +18,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-IgyDJvx+CxjSm2Aoh6TEPUcGdPJi48YnNyAhGUYVYjQ="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-gS1/n4UimdPi79/a1itsh172YtBr2jvRSu+u2C4NZ70="; }; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; buildPhase = '' diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index 3b522f964ce528..5bbf34ab703f95 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -15,7 +15,7 @@ openssl, pango, pkg-config, - pnpm, + pnpm_9, rustc, rustPlatform, stdenv, @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-LtQS0kH+2P4odV7BJYiH6T51+iZHAM9W9mV96rNfNWs="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-Y14wBYiAsctMf4Ljt7G/twGEQP2nCSDQZVG8otImnIE="; }; @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { gobject-introspection makeBinaryWrapper nodejs - pnpm.configHook + pnpm_9.configHook pkg-config rustc rustPlatform.cargoSetupHook diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix index 77f3a5908c8f91..97c3d85587a5c6 100644 --- a/pkgs/by-name/ta/tabby-agent/package.nix +++ b/pkgs/by-name/ta/tabby-agent/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, nix-update-script, nodejs, - pnpm, + pnpm_9, wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - pnpm.configHook + pnpm_9.configHook wrapGAppsHook3 ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-WBhkrgLTTR5f8ZVmUfzMbFw/6jIGoLcUspHCsNpOxx4="; }; diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix index cdd30749f2c26f..456689531f35b6 100644 --- a/pkgs/by-name/ta/taler-wallet-core/package.nix +++ b/pkgs/by-name/ta/taler-wallet-core/package.nix @@ -8,7 +8,7 @@ srcOnly, removeReferencesTo, nodejs, - pnpm, + pnpm_9, python3, git, jq, @@ -48,13 +48,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ customPython nodejs - pnpm.configHook + pnpm_9.configHook git jq zip ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-+RxTTm5t0/0hLKxhWILzb0qf6aZzbOZJYJenRpX8UdA="; }; diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 6dba2492e2422c..08f504b91a8677 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -7,7 +7,7 @@ lib, nix-update, nodejs, - pnpm, + pnpm_9, stdenv, writeShellScript, buildWebExtension ? false, @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-sU2eJUUw7crvzMGGBQP6rbxISkL+S5nmT3QspyYXlRQ="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname src; hash = "sha256-vVzERis1W3QZB/i6SQR9dQR56yDWadKWvFr+nLTQY9Y="; @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ git nodejs - pnpm.configHook + pnpm_9.configHook ]; env = { diff --git a/pkgs/by-name/we/wealthfolio/package.nix b/pkgs/by-name/we/wealthfolio/package.nix index a218e528506431..775222337e0f16 100644 --- a/pkgs/by-name/we/wealthfolio/package.nix +++ b/pkgs/by-name/we/wealthfolio/package.nix @@ -7,7 +7,7 @@ nodejs, openssl, pkg-config, - pnpm, + pnpm_9, rustPlatform, webkitgtk_4_0, wrapGAppsHook3, @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-AH0bwzsnGaGE82Ds1pDeZkVY2GXEB7RqHYw+WAt69/4="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) src pname version; hash = "sha256-OpQg/ZZ4M2vszMZeCJAKzqGduxexZfIVe3Jy/hG3Yu0="; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { cargo-tauri_1.hook nodejs pkg-config - pnpm.configHook + pnpm_9.configHook rustPlatform.cargoSetupHook wrapGAppsHook3 ]; diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index ad68279740d604..49331a37d2f4aa 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, nix-update-script, - pnpm, + pnpm_9, nodejs, makeWrapper, electron, @@ -25,14 +25,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-AndJqk1VAUdC4pOTRzyfhdxmzJMskGF6pUiqPs3fIy4="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-/7JIeQZt3QsKrjujSucRLiHfhfSllK7FeumNA4eHqSY="; }; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0f9a6f0e63355..2dcf534809e0bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4967,7 +4967,7 @@ with pkgs; inherit (callPackage ../development/tools/pnpm { }) pnpm_8 pnpm_9 pnpm_10; - pnpm = pnpm_9; + pnpm = throw "test"; po4a = perlPackages.Po4a;