From 5536ff139e14ae1d5993589072f53cd5fb4d7fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 8 Jan 2025 12:52:59 +0100 Subject: [PATCH] pnpm: pnpm_9 -> pnpm_10 wip --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ .../virtualization/podman-desktop/default.nix | 6 +++--- pkgs/by-name/ap/apache-answer/package.nix | 6 +++--- pkgs/by-name/as/astro-language-server/package.nix | 6 +++--- pkgs/by-name/ca/cargo-tauri/test-app.nix | 4 ++-- pkgs/by-name/cl/clash-verge-rev/webui.nix | 6 +++--- pkgs/by-name/da/daed/package.nix | 6 +++--- pkgs/by-name/de/deltachat-desktop/package.nix | 4 ++-- pkgs/by-name/fl/flood/package.nix | 6 +++--- pkgs/by-name/fo/follow/package.nix | 6 +++--- pkgs/by-name/fr/froide/package.nix | 6 +++--- pkgs/by-name/gi/gitify/package.nix | 6 +++--- pkgs/by-name/go/goofcord/package.nix | 4 ++-- 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/ho/homer/package.nix | 6 +++--- 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/mo/modrinth-app-unwrapped/package.nix | 4 ++-- pkgs/by-name/mo/moonfire-nvr/package.nix | 6 +++--- pkgs/by-name/n8/n8n/package.nix | 6 +++--- pkgs/by-name/oc/ocis/package.nix | 6 +++--- pkgs/by-name/oc/ocis/web.nix | 6 +++--- pkgs/by-name/ov/overlayed/webui.nix | 6 +++--- pkgs/by-name/pa/parca/package.nix | 6 +++--- pkgs/by-name/pg/pgrok/package.nix | 6 +++--- pkgs/by-name/pi/piped/package.nix | 6 +++--- pkgs/by-name/po/porn-vault/package.nix | 4 ++-- pkgs/by-name/rq/rquickshare/package.nix | 6 +++--- pkgs/by-name/rs/rsshub/package.nix | 6 +++--- pkgs/by-name/si/siyuan/package.nix | 4 ++-- pkgs/by-name/sk/sketchybar-app-font/package.nix | 6 +++--- pkgs/by-name/su/surrealist/package.nix | 6 +++--- pkgs/by-name/sy/synchrony/package.nix | 6 +++--- pkgs/by-name/ta/tabby-agent/package.nix | 6 +++--- .../by-name/ta/tailwindcss-language-server/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/by-name/za/zammad/package.nix | 6 +++--- .../python-modules/django-filingcabinet/default.nix | 6 +++--- pkgs/games/heroic/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 ++- 45 files changed, 130 insertions(+), 127 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 97e0ca92469f19..d55134bde47807 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -174,6 +174,8 @@ - `linuxPackages.nvidiaPackages.dc_520` has been removed since it is marked broken and there are better newer alternatives. +- `pnpm` was updated to version 10. If your project is incompatible, you can install the previous version from the package attribute `pnpm_9`. + - `programs.less.lessopen` is now null by default. To restore the previous behaviour, set it to `''|${lib.getExe' pkgs.lesspipe "lesspipe.sh"} %s''`. - `hardware.pulseaudio` has been renamed to `services.pulseaudio`. The deprecated option names will continue to work, but causes a warning. diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index 8cab09d6a8608e..c25dcc390f9117 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -5,7 +5,7 @@ , copyDesktopItems , electron , nodejs -, pnpm +, pnpm_9 , makeDesktopItem , autoSignDarwinBinariesHook , nix-update-script @@ -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/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix index 2a39d54a2494ba..efa453863614c5 100644 --- a/pkgs/by-name/ap/apache-answer/package.nix +++ b/pkgs/by-name/ap/apache-answer/package.nix @@ -2,7 +2,7 @@ buildGoModule, lib, fetchFromGitHub, - pnpm, + pnpm_9, nodejs, fetchpatch, stdenv, @@ -25,14 +25,14 @@ buildGoModule rec { sourceRoot = "${src.name}/ui"; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit src version pname; sourceRoot = "${src.name}/ui"; hash = "sha256-/se6IWeHdazqS7PzOpgtT4IxCJ1WptqBzZ/BdmGb4BA="; }; nativeBuildInputs = [ - pnpm.configHook + pnpm_9.configHook nodejs ]; diff --git a/pkgs/by-name/as/astro-language-server/package.nix b/pkgs/by-name/as/astro-language-server/package.nix index 4efdc6e54719dd..0d30d9ccdb648d 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,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs_22 - pnpm.configHook + pnpm_9.configHook ]; buildInputs = [ nodejs_22 ]; diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix index 0b9ead6eca90cd..dddde2377a35bd 100644 --- a/pkgs/by-name/ca/cargo-tauri/test-app.nix +++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (cargo-tauri) cargoDeps; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { nodejs pkg-config - pnpm.configHook + pnpm_9.configHook rustPlatform.cargoCheckHook rustPlatform.cargoSetupHook wrapGAppsHook4 diff --git a/pkgs/by-name/cl/clash-verge-rev/webui.nix b/pkgs/by-name/cl/clash-verge-rev/webui.nix index 7cd35cd6c368d2..d8cdc4f80b1b6b 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, @@ -11,14 +11,14 @@ stdenv.mkDerivation { inherit version src meta; pname = "${pname}-webui"; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = npm-hash; }; 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 0a04f2eb2a0b40..3143b3c33a760c 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/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index 311acdceb04fd1..50dd45b639d158 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-G/qBGyx+vxkJvwmBYG5kpx01OO0C9dPji0Cafna9pyw="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-UwfblmCkJOuy2Et5Rjm8ONWLbDmLppazqIk2+rV2RJU="; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper nodejs pkg-config - pnpm.configHook + pnpm_9.configHook python3 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems 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 9add047a1c983a..fed49a03069b81 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/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix index e33a08bfb9daf4..2c0927aca9b5aa 100644 --- a/pkgs/by-name/fr/froide/package.nix +++ b/pkgs/by-name/fr/froide/package.nix @@ -5,7 +5,7 @@ makeWrapper, gdal, geos, - pnpm, + pnpm_9, nodejs, postgresql, postgresqlTestHook, @@ -42,7 +42,7 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper nodejs - pnpm.configHook + pnpm_9.configHook ]; dependencies = with python.pkgs; [ @@ -99,7 +99,7 @@ python.pkgs.buildPythonApplication rec { websockets ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-DMoaXNm5S64XBERHFnFM6IKBkzXRGDEYWSTruccK9Hc="; }; diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index 94277985556eaf..3d807ba7b9ad8b 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, + pnpm_9, nodejs, electron, makeDesktopItem, @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook copyDesktopItems imagemagick makeWrapper ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-I78AvOBdDd59eVJJ51xxNwVvMnNvLdJJpFEtE/I1H8U="; }; diff --git a/pkgs/by-name/go/goofcord/package.nix b/pkgs/by-name/go/goofcord/package.nix index 45287af656f1e4..95e7d9824df842 100644 --- a/pkgs/by-name/go/goofcord/package.nix +++ b/pkgs/by-name/go/goofcord/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - pnpm, + pnpm_9, nodejs_22, nix-update-script, electron, @@ -14,7 +14,7 @@ }: let - pnpm' = pnpm.override { nodejs = nodejs_22; }; + pnpm' = pnpm_9.override { nodejs = nodejs_22; }; in stdenv.mkDerivation (finalAttrs: { pname = "goofcord"; diff --git a/pkgs/by-name/gu/gui-for-clash/package.nix b/pkgs/by-name/gu/gui-for-clash/package.nix index 9bd8c3b9f9e5f2..402e3ba6cb4e5e 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, @@ -30,10 +30,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-mG8b16PP876EyaX3Sc4WM41Yc/oDGZDiilZPaxPvvuQ="; diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix index be491136b5b94f..08620f978925ba 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, @@ -30,10 +30,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-dLI1YMzs9lLk9lJBkBgc6cpirM79khy0g5VaOVEzUAc="; diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix index 48d4b62bf80fc2..3139f8f8f5d5e5 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/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix index 221c015814b2eb..50fe5bf1fc595e 100644 --- a/pkgs/by-name/ho/homer/package.nix +++ b/pkgs/by-name/ho/homer/package.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, - pnpm, + pnpm_9, nodejs, dart-sass, nix-update-script, @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-nOhovVqWlHPunwruJrgqFhhDxccKBp/iEyB3Y3C5Cz8="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ nodejs dart-sass - pnpm.configHook + pnpm_9.configHook ]; buildPhase = '' diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index ae70d077a298e2..a6bd478b084abb 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 37ffb48eb4c9b5..916f7b43a2b4e8 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-aw8Sh4BecQ09rC0OLWebdWc7D/LE8vPs9uqh6w5G/FM="; }; diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 51e444d3c5cd21..83437930502806 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.hostPlatform.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/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 1323ac457f59cf..fa60bdae2e311e 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-D9hkdliyKc8m9i2D9pG3keGmZsx+rzrgVXZws9Ot24I="; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-nFuPFgwJw38XVxhW0QXmU31o+hqJKGJysnPg2YSg2D0="; }; @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { desktop-file-utils nodejs pkg-config - pnpm.configHook + pnpm_9.configHook ] ++ lib.optional stdenv.hostPlatform.isDarwin makeBinaryWrapper; buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1; diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix index fb5951e96d71b2..4d3f462d69d230 100644 --- a/pkgs/by-name/mo/moonfire-nvr/package.nix +++ b/pkgs/by-name/mo/moonfire-nvr/package.nix @@ -10,7 +10,7 @@ moonfire-nvr, darwin, nodejs, - pnpm, + pnpm_9, }: let @@ -28,9 +28,9 @@ let sourceRoot = "${src.name}/ui"; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.src.name}/ui"; hash = "sha256-7fMhUFlV5lz+A9VG8IdWoc49C2CTdLYQlEgBSBqJvtw="; diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 90b969fd484a14..18fea621c6ac76 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, xcbuild, @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-GIA2y81nuKWe1zuZQ99oczQtQWStyT1Qh3bZ1oe8me4="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-riuN7o+uUXS5G7fMgE7cZhGWHZtGwSHm4CP7G46R5Cw="; }; nativeBuildInputs = [ - pnpm.configHook + pnpm_9.configHook python3 # required to build sqlite3 bindings node-gyp # required to build sqlite3 bindings makeWrapper diff --git a/pkgs/by-name/oc/ocis/package.nix b/pkgs/by-name/oc/ocis/package.nix index 174c36d5771de0..41669e7cf9f877 100644 --- a/pkgs/by-name/oc/ocis/package.nix +++ b/pkgs/by-name/oc/ocis/package.nix @@ -5,7 +5,7 @@ buildGoModule, callPackage, gnumake, - pnpm, + pnpm_9, nodejs, ocis, }: @@ -44,10 +44,10 @@ buildGoModule rec { nativeBuildInputs = [ gnumake nodejs - pnpm.configHook + pnpm_9.configHook ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; sourceRoot = "${src.name}/services/idp"; hash = "sha256-gNlN+u/bobnTsXrsOmkDcWs67D/trH3inT5AVQs3Brs="; diff --git a/pkgs/by-name/oc/ocis/web.nix b/pkgs/by-name/oc/ocis/web.nix index eb8175b6dc9263..def8a16b351d68 100644 --- a/pkgs/by-name/oc/ocis/web.nix +++ b/pkgs/by-name/oc/ocis/web.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, nodejs, - pnpm, + pnpm_9, fetchFromGitHub, }: stdenvNoCC.mkDerivation rec { @@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; buildPhase = '' @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-3Erva6srdkX1YQ727trx34Ufx524nz19MUyaDQToz6M="; }; 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/pa/parca/package.nix b/pkgs/by-name/pa/parca/package.nix index 5ff206041ef41d..3c9758e81100c4 100644 --- a/pkgs/by-name/pa/parca/package.nix +++ b/pkgs/by-name/pa/parca/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, lib, nodejs, - pnpm, + pnpm_9, stdenv, }: let @@ -22,7 +22,7 @@ let pname = "parca-ui"; src = "${parca-src}/ui"; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname src version; hash = "sha256-MVNO24Oksy/qRUmEUoWoviQEo6Eimb18ZnDj5Z1vJkY="; }; @@ -30,7 +30,7 @@ let nativeBuildInputs = [ faketty nodejs - pnpm.configHook + pnpm_9.configHook ]; # faketty is required to work around a bug in nx. 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/pi/piped/package.nix b/pkgs/by-name/pi/piped/package.nix index 83d721aa63fe96..3502f59f4f3786 100644 --- a/pkgs/by-name/pi/piped/package.nix +++ b/pkgs/by-name/pi/piped/package.nix @@ -1,7 +1,7 @@ { lib, buildNpmPackage, - pnpm, + pnpm_9, fetchFromGitHub, unstableGitUpdater, }: @@ -17,7 +17,7 @@ buildNpmPackage rec { hash = "sha256-o3TwE0s5rim+0VKR+oW9Rv3/eQRf2dgRQK4xjZ9pqCE="; }; - npmConfigHook = pnpm.configHook; + npmConfigHook = pnpm_9.configHook; installPhase = '' runHook preInstall @@ -26,7 +26,7 @@ buildNpmPackage rec { ''; npmDeps = pnpmDeps; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-WtZfRZFRV9I1iBlAoV69GGFjdiQhTSBG/iiEadPVcys="; }; diff --git a/pkgs/by-name/po/porn-vault/package.nix b/pkgs/by-name/po/porn-vault/package.nix index 68117be33e72db..44a4fbc93f9f58 100644 --- a/pkgs/by-name/po/porn-vault/package.nix +++ b/pkgs/by-name/po/porn-vault/package.nix @@ -52,14 +52,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-wQ3dqLc0l2BmLGDYrbWxX2mPwO/Tqz0fY/fOQTEUv24="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-Xr9tRiP1hW+aFs9FnPvPkeJ0/LtJI57cjWY5bZQaRTQ="; }; nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook makeWrapper ]; diff --git a/pkgs/by-name/rq/rquickshare/package.nix b/pkgs/by-name/rq/rquickshare/package.nix index 578a3f5a240e56..1cd300f6ba0a29 100644 --- a/pkgs/by-name/rq/rquickshare/package.nix +++ b/pkgs/by-name/rq/rquickshare/package.nix @@ -12,7 +12,7 @@ openssl, perl, pkg-config, - pnpm, + pnpm_9, protobuf, rustPlatform, stdenv, @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { ''; pnpmRoot = "app/${app-type}"; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; sourceRoot = "${src.name}/app/${app-type}"; @@ -73,7 +73,7 @@ rustPlatform.buildRustPackage rec { # Setup pnpm nodejs - pnpm.configHook + pnpm_9.configHook # Make sure we can find our libraries perl 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/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index e86b092545bd82..c9e0fa0307663a 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -77,12 +77,12 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook makeWrapper copyDesktopItems ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index 3790f8a00b110c..299e84863efada 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-8SWN22pjHnXWM+RUEYNux0ZWhRUVMib3M7r2SlI33tQ="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-NGAgueJ+cuK/csjdf94KNklu+Xf91BHoWKVgEctX6eA="; }; 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 e13a41c1bca1f0..fd594e47f2e556 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: { patchFlags = [ "-p2" ]; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-uBDbBfWC9HxxzY1x4+rNo87D5C1zZa2beFLa5NkLs80="; }; @@ -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/sy/synchrony/package.nix b/pkgs/by-name/sy/synchrony/package.nix index 9027cc93e593f1..fdc86661cbfb1f 100644 --- a/pkgs/by-name/sy/synchrony/package.nix +++ b/pkgs/by-name/sy/synchrony/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, nodejs, - pnpm, + pnpm_9, nix-update-script, fetchurl, runCommand, @@ -22,10 +22,10 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; hash = "sha256-+hS4UK7sncCxv6o5Yl72AeY+LSGLnUTnKosAYB6QsP0="; }; diff --git a/pkgs/by-name/ta/tabby-agent/package.nix b/pkgs/by-name/ta/tabby-agent/package.nix index 67c87196690775..d260b626d0db89 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-fpzl2w0o5bJhppVUl6vRNqAVQNMPLK0+JX/KYEtUGGA="; }; diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix index 6a532b2cab56fc..fd56c58586af54 100644 --- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, nodejs_22, - pnpm, + pnpm_9, }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FphKiGMTMQj/tBmrwkPVlb+dEGjf+N4EgZtOVg7iL2M="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs_22 - pnpm.configHook + pnpm_9.configHook ]; buildInputs = [ nodejs_22 ]; diff --git a/pkgs/by-name/ta/taler-wallet-core/package.nix b/pkgs/by-name/ta/taler-wallet-core/package.nix index 0d2330553fb2ba..34ecb9fcfdd243 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-BVVmv0VVvQ2YhL0zOKiM1oVKJKvqwMGNR47DkcCj874="; }; 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 bdb44f343fdde4..f22d0c2cdcf64f 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_1, wrapGAppsHook3, @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-2g5zfRRxRm7/pCyut7weC4oTegwxCbvYpWSC2+qfcR8="; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) src pname version; hash = "sha256-CNk4zysIIDzDxozCrUnsR63eme28mDsBkRVB/1tXnJI="; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { cargo-tauri.hook nodejs pkg-config - pnpm.configHook + pnpm_9.configHook rustPlatform.cargoSetupHook wrapGAppsHook3 ]; diff --git a/pkgs/by-name/za/zammad/package.nix b/pkgs/by-name/za/zammad/package.nix index da0d0bdab660e2..452af8ef5c94c6 100644 --- a/pkgs/by-name/za/zammad/package.nix +++ b/pkgs/by-name/za/zammad/package.nix @@ -14,7 +14,7 @@ jq, moreutils, nodejs, - pnpm, + pnpm_9, cacert, redis, dataDir ? "/var/lib/zammad", @@ -94,7 +94,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ redis postgresql - pnpm.configHook + pnpm_9.configHook nodejs procps cacert @@ -102,7 +102,7 @@ stdenvNoCC.mkDerivation { env.RAILS_ENV = "production"; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname src; hash = "sha256-bdm1nkJnXE7oZZhG2uBnk3fYhITaMROHGKPbf0G3bFs="; diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix index bbace0ec1af96d..689a554c6da866 100644 --- a/pkgs/development/python-modules/django-filingcabinet/default.nix +++ b/pkgs/development/python-modules/django-filingcabinet/default.nix @@ -28,7 +28,7 @@ poppler_utils, pytest-playwright, playwright-driver, - pnpm, + pnpm_9, nodejs, }: @@ -55,7 +55,7 @@ buildPythonPackage rec { nativeBuildInputs = [ nodejs - pnpm.configHook + pnpm_9.configHook ]; dependencies = [ @@ -85,7 +85,7 @@ buildPythonPackage rec { #annotate = [ fcdocs-annotate ]; }; - pnpmDeps = pnpm.fetchDeps { + pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; hash = "sha256-32kOhB2+37DD4hKXKep08iDxhXpasKPfcv9fkwISxeU="; }; diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index db33d848568440..c14915ccdbd8c6 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, python3, makeWrapper, @@ -26,14 +26,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 python3 makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b57936a258612b..d6e09534ffad86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1643,6 +1643,7 @@ with pkgs; authelia = callPackage ../servers/authelia { buildGoModule = buildGo123Module; + pnpm = pnpm_9; }; authentik-outposts = recurseIntoAttrs (callPackages ../by-name/au/authentik/outposts.nix { }); @@ -4772,7 +4773,7 @@ with pkgs; inherit (callPackage ../development/tools/pnpm { }) pnpm_8 pnpm_9 pnpm_10; - pnpm = pnpm_9; + pnpm = pnpm_10; po4a = perlPackages.Po4a;