diff --git a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix index ad57d3e15f26..8a6ae2e09101 100644 --- a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix +++ b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix @@ -3,7 +3,7 @@ pkgs, stdenv, fetchFromGitHub, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -12,6 +12,8 @@ }: let + pnpm = pnpm_10; + vsix = stdenv.mkDerivation (finalAttrs: { name = "gitlens-${finalAttrs.version}.vsix"; pname = "gitlens-vsix"; @@ -26,6 +28,7 @@ let pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-Yuxuqr1BiviSw+dGNHLs2jAy8ADlBvRks6Kmy7FmCMw="; }; diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index 627b30007bdb..ce082884d3d2 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -11,6 +11,8 @@ }: let + pnpm = pnpm_10; + vsix = stdenvNoCC.mkDerivation (finalAttrs: { name = "roo-code-${finalAttrs.version}.vsix"; pname = "roo-code-vsix"; @@ -25,6 +27,7 @@ let pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-t2sPuhn8xdk6hGfmViPGG+5TAhtBBOMYNoOb6DlPzws="; }; diff --git a/pkgs/by-name/ag/agent-browser/package.nix b/pkgs/by-name/ag/agent-browser/package.nix index 327271bcb537..443788e686b5 100644 --- a/pkgs/by-name/ag/agent-browser/package.nix +++ b/pkgs/by-name/ag/agent-browser/package.nix @@ -5,7 +5,7 @@ fetchPnpmDeps, rustPlatform, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, geist-font, nix-update-script, @@ -14,6 +14,8 @@ }: let + pnpm = pnpm_10; + version = "0.27.0"; src = fetchFromGitHub { @@ -39,7 +41,7 @@ let pnpmDeps = fetchPnpmDeps { pname = "agent-browser-dashboard"; - inherit version src; + inherit version src pnpm; pnpmWorkspaces = [ "dashboard" ]; fetcherVersion = 3; hash = "sha256-ldxmXpejqVN/xuWcdLYMwNPc1VZ1rdNwRrumy8Is3N4="; diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix index e7b0674f5b57..730dc2d4a2f2 100644 --- a/pkgs/by-name/ap/apache-airflow/python-package.nix +++ b/pkgs/by-name/ap/apache-airflow/python-package.nix @@ -7,7 +7,7 @@ # javascript fetchPnpmDeps, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, # python @@ -97,6 +97,8 @@ let hash = "sha256-qFgI65wAttERPCHn7ezSdNGB0sclEV7zYIBqaC0Gs4A="; }; + pnpm = pnpm_10; + airflowUi = stdenv.mkDerivation rec { pname = "airflow-ui-assets"; inherit src version; @@ -110,7 +112,12 @@ let pnpmDeps = fetchPnpmDeps { pname = "airflow-ui"; - inherit sourceRoot src version; + inherit + sourceRoot + src + version + pnpm + ; fetcherVersion = 3; hash = "sha256-zPIql9rP4EkE0Y3ihP4MkWTTYCIDr8d1LpE6vePiNdU="; }; diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix index ae23d134d633..b83f69f92c2f 100644 --- a/pkgs/by-name/ap/apache-answer/package.nix +++ b/pkgs/by-name/ap/apache-answer/package.nix @@ -4,11 +4,13 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, stdenv, }: - +let + pnpm = pnpm_10; +in buildGoModule (finalAttrs: { pname = "apache-answer"; version = "1.7.1"; @@ -28,6 +30,7 @@ buildGoModule (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) src version pname; + inherit pnpm; sourceRoot = "${finalAttrs.src.name}/ui"; fetcherVersion = 3; hash = "sha256-0Jqe0wig28Vb9y0/tZHDfE49MehNR7kJTpChz616tzU="; diff --git a/pkgs/by-name/au/authelia/package.nix b/pkgs/by-name/au/authelia/package.nix index 1db561604cfa..280b70dffc73 100644 --- a/pkgs/by-name/au/authelia/package.nix +++ b/pkgs/by-name/au/authelia/package.nix @@ -4,7 +4,7 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, fetchFromGitHub, buildGo125Module, installShellFiles, @@ -15,13 +15,15 @@ nodejs fetchPnpmDeps pnpmConfigHook - pnpm + pnpm_10 fetchFromGitHub ; }, }: let + pnpm = pnpm_10; + buildGoModule = buildGo125Module; inherit (import ./sources.nix { inherit fetchFromGitHub; }) diff --git a/pkgs/by-name/au/authelia/web.nix b/pkgs/by-name/au/authelia/web.nix index dd4f8851f0c8..3f5336adfca7 100644 --- a/pkgs/by-name/au/authelia/web.nix +++ b/pkgs/by-name/au/authelia/web.nix @@ -3,11 +3,13 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, fetchFromGitHub, }: let + pnpm = pnpm_10; + inherit (import ./sources.nix { inherit fetchFromGitHub; }) pname version diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix index 8d0d34035e6b..d80ee5affbab 100644 --- a/pkgs/by-name/bu/bumpp/package.nix +++ b/pkgs/by-name/bu/bumpp/package.nix @@ -5,11 +5,14 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, npmHooks, versionCheckHook, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "bumpp"; version = "11.0.1"; @@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-nIj4S5BWTaw3RVNIxbla8Q31wvK67Of6psx5wX9ID+E="; }; diff --git a/pkgs/by-name/ch/changelogen/package.nix b/pkgs/by-name/ch/changelogen/package.nix index e4452f35f38f..4b55fa64c3ed 100644 --- a/pkgs/by-name/ch/changelogen/package.nix +++ b/pkgs/by-name/ch/changelogen/package.nix @@ -5,10 +5,13 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, npmHooks, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "changelogen"; version = "0.6.2"; @@ -22,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-S+GxeljcPj/MzBkleVNgaRa8D4kmHrKwwVqakmB5sAw="; }; diff --git a/pkgs/by-name/cl/claude-code-router/package.nix b/pkgs/by-name/cl/claude-code-router/package.nix index 1fd4c1903c31..fd21043b3c6f 100644 --- a/pkgs/by-name/cl/claude-code-router/package.nix +++ b/pkgs/by-name/cl/claude-code-router/package.nix @@ -4,12 +4,14 @@ lib, makeBinaryWrapper, nodejs, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, versionCheckHook, }: - +let + pnpm = pnpm_10; +in buildNpmPackage (finalAttrs: { pname = "claude-code-router"; version = "2.0.0"; diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix index 20492fbabd6c..7544d9edaa64 100644 --- a/pkgs/by-name/co/context7-mcp/package.nix +++ b/pkgs/by-name/co/context7-mcp/package.nix @@ -7,12 +7,14 @@ versionCheckHook, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, fetchPnpmDeps, }: let tag-prefix = "@upstash/context7-mcp"; + + pnpm = pnpm_10; in stdenv.mkDerivation (finalAttrs: { pname = "context7-mcp"; @@ -34,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-f3PXpCdmKh2LPD5VyFsRdLR7CEvh+GozkQFSeeNuj2c="; }; diff --git a/pkgs/by-name/co/conventional-changelog-cli/package.nix b/pkgs/by-name/co/conventional-changelog-cli/package.nix index f48c185548db..6c2ee732f9fe 100644 --- a/pkgs/by-name/co/conventional-changelog-cli/package.nix +++ b/pkgs/by-name/co/conventional-changelog-cli/package.nix @@ -5,12 +5,14 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, makeBinaryWrapper, versionCheckHook, nix-update-script, }: - +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "conventional-changelog-cli"; version = "7.2.0"; @@ -24,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-O91ypnycBwkfLSruezx9E5CrytguBdtmvgVhKFjUzvM="; }; diff --git a/pkgs/by-name/ct/ctx7/package.nix b/pkgs/by-name/ct/ctx7/package.nix index 9df02ddda524..132a6b753e4a 100644 --- a/pkgs/by-name/ct/ctx7/package.nix +++ b/pkgs/by-name/ct/ctx7/package.nix @@ -7,10 +7,13 @@ versionCheckHook, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, fetchPnpmDeps, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "ctx7"; version = "0.3.9"; @@ -31,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-8RRHfCTZVC91T1Qx+ACCo2oG4ZwMNy5WYakCjmBhe3Q="; }; diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index c4cba7c6d64b..fe6791b038ba 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -15,7 +15,7 @@ commandLineArgs ? "", fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, asar, copyDesktopItems, darwin, @@ -23,6 +23,7 @@ }: let + pnpm = pnpm_10; electron = electron_41; seshat = callPackage ./seshat { }; in @@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { version src ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-0yqWObZtRntsH7gk+OB8pMuWsrvCQ4L9173Qv0o5abk="; }; diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix index bd13a9fc861b..a0d22d6c73c9 100644 --- a/pkgs/by-name/el/element-web-unwrapped/package.nix +++ b/pkgs/by-name/el/element-web-unwrapped/package.nix @@ -6,12 +6,14 @@ nodejs, jitsi-meet, fetchPnpmDeps, - pnpm, + pnpm_10, pnpmConfigHook, faketty, }: let + pnpm = pnpm_10; + noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org }; @@ -36,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { pname = "element"; inherit (finalAttrs) version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-0yqWObZtRntsH7gk+OB8pMuWsrvCQ4L9173Qv0o5abk="; }; diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix index cc7bde39533a..29ac289460c0 100644 --- a/pkgs/by-name/fr/froide/package.nix +++ b/pkgs/by-name/fr/froide/package.nix @@ -8,13 +8,14 @@ geos, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, postgresql, postgresqlTestHook, playwright-driver, }: let + pnpm = pnpm_10; python = python3Packages.python.override { packageOverrides = self: super: { @@ -120,7 +121,12 @@ python.pkgs.buildPythonApplication rec { ]; pnpmDeps = fetchPnpmDeps { - inherit pname version src; + inherit + pname + version + src + pnpm + ; fetcherVersion = 3; hash = "sha256-NbfCVD+gmtoxuYUCumTKj9P72utK787VdlnuU4lMMGc="; }; diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index 8acddb6fb185..07c6d25cb601 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -19,7 +19,7 @@ pkg-config, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, rust, rustPlatform, turbo, @@ -27,7 +27,9 @@ wrapGAppsHook4, dart-sass, }: - +let + pnpm = pnpm_10; +in rustPlatform.buildRustPackage (finalAttrs: { pname = "gitbutler"; version = "0.19.7"; @@ -58,6 +60,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-eRiFA5lXpPHQwlyFmKMx1zmHH2zLCHB+3s708g6srg4="; }; diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index dde80c010b73..bd18a6031ecf 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -13,19 +13,22 @@ openssh, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, stdenv, sqliteSupport ? true, nixosTests, }: let + pnpm = pnpm_10; + frontend = stdenv.mkDerivation (finalAttrs: { pname = "gitea-frontend"; inherit (gitea) src version; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-dewYYPO2wmNyYiQadoEKWJ10cghm6Lv7UE1iVlyNiEY="; }; diff --git a/pkgs/by-name/go/goaway/package.nix b/pkgs/by-name/go/goaway/package.nix index 3f9131cfaf61..a0e9cb7965eb 100644 --- a/pkgs/by-name/go/goaway/package.nix +++ b/pkgs/by-name/go/goaway/package.nix @@ -6,12 +6,14 @@ makeWrapper, net-tools, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, stdenvNoCC, }: let + pnpm = pnpm_10; + version = "0.63.15"; src = fetchFromGitHub { @@ -27,6 +29,7 @@ let pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; sourceRoot = "${finalAttrs.src.name}/client"; fetcherVersion = 3; hash = "sha256-GM86Os1OQaagD61BEIIsqhWJNVPFA9Z5RiYWyHlQlwY="; diff --git a/pkgs/by-name/he/headplane/package.nix b/pkgs/by-name/he/headplane/package.nix index a596e5918356..2d71367644ea 100644 --- a/pkgs/by-name/he/headplane/package.nix +++ b/pkgs/by-name/he/headplane/package.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + pnpm = pnpm_10; hash = pnpmDepsHash; fetcherVersion = 3; }; diff --git a/pkgs/by-name/ki/kilocode-cli/package.nix b/pkgs/by-name/ki/kilocode-cli/package.nix index e86cbcf5bb0b..e12c8b0c31b9 100644 --- a/pkgs/by-name/ki/kilocode-cli/package.nix +++ b/pkgs/by-name/ki/kilocode-cli/package.nix @@ -8,7 +8,7 @@ nodejs, writableTmpDirAsHomeHook, pnpmConfigHook, - pnpm, + pnpm_10, unzip, patchelf, autoPatchelfHook, @@ -16,6 +16,9 @@ versionCheckHook, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "kilocode-cli"; version = "0.25.1"; @@ -29,6 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-Q/LamZwVaIQVILtXRi1RQrYtpxYJWEKPAt3knwm47S0="; }; diff --git a/pkgs/by-name/mc/mcporter/package.nix b/pkgs/by-name/mc/mcporter/package.nix index 5eb9e42d0dd8..cffa8b07821f 100644 --- a/pkgs/by-name/mc/mcporter/package.nix +++ b/pkgs/by-name/mc/mcporter/package.nix @@ -5,12 +5,14 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, npmHooks, versionCheckHook, nix-update-script, }: - +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "mcporter"; version = "0.10.2"; @@ -24,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-TZfEoUSjba8cRz6L9uY2PGskYsR7S/xAahiKLd8dhFM="; }; diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix index 805ca74c1352..bd2ee2ad634d 100644 --- a/pkgs/by-name/me/memos/package.nix +++ b/pkgs/by-name/me/memos/package.nix @@ -7,9 +7,11 @@ lib, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, }: let + pnpm = pnpm_10; + version = "0.25.3"; src = fetchFromGitHub { owner = "usememos"; @@ -23,6 +25,7 @@ let inherit version src; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; sourceRoot = "${finalAttrs.src.name}/web"; fetcherVersion = 3; hash = "sha256-xEOnxCgBD4uLypcZzCO+31S4r0sSfz8PpgEmZASeRZ4="; diff --git a/pkgs/by-name/mg/mgrep/package.nix b/pkgs/by-name/mg/mgrep/package.nix index 6d6673521f7f..0ac21b3c56d3 100644 --- a/pkgs/by-name/mg/mgrep/package.nix +++ b/pkgs/by-name/mg/mgrep/package.nix @@ -1,15 +1,18 @@ { lib, + pnpm_10, stdenv, fetchFromGitHub, nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, npmHooks, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "mgrep"; version = "0.1.10"; @@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-T1mbRDBLU4SjZSgqyKgusZe5UV9hI+/bAmBYoAWcWtQ="; }; diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix index d5fc3de191b8..b4f00cfed13a 100644 --- a/pkgs/by-name/mo/moonlight/package.nix +++ b/pkgs/by-name/mo/moonlight/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -12,6 +12,9 @@ discord-canary, discord-development, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "moonlight"; version = "2026.5.0"; @@ -31,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-veZx/b+cvpcRh1xXO8Y34dJtY2cgncqVSYYywb85Geo="; }; diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index 619549072a3c..e885f5a3703b 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -5,11 +5,14 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, npmHooks, versionCheckHook, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "ni"; version = "30.1.0"; @@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-I/jf6nlsKQFrYLO15f+CWdPPdEpVDDMBQodLsbG4sqw="; }; diff --git a/pkgs/by-name/nr/nrm/package.nix b/pkgs/by-name/nr/nrm/package.nix index 7e814d867a14..f01121f472de 100644 --- a/pkgs/by-name/nr/nrm/package.nix +++ b/pkgs/by-name/nr/nrm/package.nix @@ -5,11 +5,13 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, makeBinaryWrapper, nix-update-script, }: - +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "nrm"; version = "2.1.0"; @@ -30,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-DvhUXkh9Ijuik9uWzPOtM1idSNSaJxDiRHWpUMepf3U="; }; diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 1991beab067c..084331ade53a 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -18,7 +18,7 @@ tesseract5, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, poppler-utils, liberation_ttf, xcbuild, @@ -29,6 +29,8 @@ lndir, }: let + pnpm = pnpm_10; + version = "2.20.15"; src = fetchFromGitHub { diff --git a/pkgs/by-name/pi/picgo/package.nix b/pkgs/by-name/pi/picgo/package.nix index 773264d13e62..6692f1434b70 100644 --- a/pkgs/by-name/pi/picgo/package.nix +++ b/pkgs/by-name/pi/picgo/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, nodejs_22, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, electron_40, @@ -13,7 +13,9 @@ writableTmpDirAsHomeHook, nix-update-script, }: - +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "picgo"; version = "2.5.3"; @@ -27,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) version src; + inherit pnpm; pname = "picgo"; hash = "sha256-tILvWDoHAN5XT1F/cJYgfeMzowuO/fhiughI+0FvHzc="; fetcherVersion = 3; # lockfileVersion 9.0 corresponds to fetcherVersion 3 diff --git a/pkgs/by-name/po/postcss/package.nix b/pkgs/by-name/po/postcss/package.nix index 3fc2a6198896..7ba6581adad9 100644 --- a/pkgs/by-name/po/postcss/package.nix +++ b/pkgs/by-name/po/postcss/package.nix @@ -4,11 +4,13 @@ fetchFromGitHub, fetchPnpmDeps, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, nix-update-script, }: - +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "postcss"; version = "8.5.10"; @@ -28,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-7SwgvsbSbRj1SZAEhjWp3B4D3VtAvg7UN35/5x3f5Wk="; }; diff --git a/pkgs/by-name/sa/satisfactorymodmanager/package.nix b/pkgs/by-name/sa/satisfactorymodmanager/package.nix index b190ffa04be3..8453d212767d 100644 --- a/pkgs/by-name/sa/satisfactorymodmanager/package.nix +++ b/pkgs/by-name/sa/satisfactorymodmanager/package.nix @@ -3,7 +3,7 @@ stdenv, buildGoModule, fetchFromGitHub, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, wails, @@ -12,7 +12,9 @@ makeDesktopItem, copyDesktopItems, }: - +let + pnpm = pnpm_10; +in buildGoModule rec { pname = "satisfactorymodmanager"; version = "3.0.5"; @@ -58,6 +60,7 @@ buildGoModule rec { pname version src + pnpm ; sourceRoot = "${src.name}/frontend"; fetcherVersion = 3; diff --git a/pkgs/by-name/se/session-desktop/package.nix b/pkgs/by-name/se/session-desktop/package.nix index 2d7d87a48ba1..c25c9ed69c06 100644 --- a/pkgs/by-name/se/session-desktop/package.nix +++ b/pkgs/by-name/se/session-desktop/package.nix @@ -8,7 +8,7 @@ makeWrapper, fetchpatch, replaceVars, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, rustPlatform, @@ -27,6 +27,8 @@ }: let + pnpm = pnpm_10; + fake-git = writeShellScriptBin "git" (lib.readFile ./fake-git.sh); libsession-util-nodejs = stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/sf/sftool-gui/package.nix b/pkgs/by-name/sf/sftool-gui/package.nix index f3093c92e031..1f5e876ad3ba 100644 --- a/pkgs/by-name/sf/sftool-gui/package.nix +++ b/pkgs/by-name/sf/sftool-gui/package.nix @@ -1,5 +1,6 @@ { lib, + pnpm_10, stdenv, rustPlatform, cargo-tauri, @@ -9,7 +10,6 @@ systemdLibs, fetchPnpmDeps, pnpmConfigHook, - pnpm, openssl, nix-update-script, pkg-config, @@ -18,6 +18,9 @@ autoPatchelfHook, fetchFromGitHub, }: +let + pnpm = pnpm_10; +in rustPlatform.buildRustPackage (finalAttrs: { pname = "sftool-gui"; version = "1.1.4-unstable-2026-04-16"; @@ -41,6 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = fetchPnpmDeps { fetcherVersion = 3; inherit (finalAttrs) pname version src; + inherit pnpm; hash = "sha256-DwDXfbwgt/OSNOQbzCBlathX9QDnbEsXZLsgB67LOEk="; }; diff --git a/pkgs/by-name/sh/shiru/package.nix b/pkgs/by-name/sh/shiru/package.nix index 71f050bff3e9..6a1edc181684 100644 --- a/pkgs/by-name/sh/shiru/package.nix +++ b/pkgs/by-name/sh/shiru/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - pnpm, + pnpm_10, nodejs, fetchFromGitHub, python3, @@ -14,6 +14,7 @@ nix-update-script, }: let + pnpm = pnpm_10; electron = electron_39; in stdenv.mkDerivation (finalAttrs: { @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; prePnpmInstall = '' cd electron ''; diff --git a/pkgs/by-name/sh/shoko-webui/package.nix b/pkgs/by-name/sh/shoko-webui/package.nix index b537f3d6e6d3..5e25f5c5bf22 100644 --- a/pkgs/by-name/sh/shoko-webui/package.nix +++ b/pkgs/by-name/sh/shoko-webui/package.nix @@ -3,12 +3,15 @@ fetchFromGitHub, fetchPnpmDeps, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, lib, shoko, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "shoko-webui"; version = "2.4.1"; @@ -27,6 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-rTlem83dFptgvKUKUaHK8vi5B0FBehPFtkCUhOnUKd0="; }; diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix index 52bed4866986..3bbfbfad441c 100644 --- a/pkgs/by-name/sh/shopify-cli/package.nix +++ b/pkgs/by-name/sh/shopify-cli/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, faketty, nodejs_22, versionCheckHook, @@ -12,6 +12,8 @@ nix-update-script, }: let + pnpm = pnpm_10; + nodejs = nodejs_22; pnpm' = pnpm.override { inherit nodejs; }; in @@ -28,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-gwEVlvr8hxgyCsGjxjz1UkbDZYYq1iukKTPJ7JHdo2U="; }; diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix index 19de85ad5277..a55faadb62c7 100644 --- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix +++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix @@ -1,8 +1,8 @@ { stdenv, + pnpm, lib, fetchFromGitHub, - pnpm, fetchPnpmDeps, pnpmConfigHook, nodejs, diff --git a/pkgs/by-name/sk/skills/package.nix b/pkgs/by-name/sk/skills/package.nix index 7fbaff73ff6e..9a8cabd2aa40 100644 --- a/pkgs/by-name/sk/skills/package.nix +++ b/pkgs/by-name/sk/skills/package.nix @@ -3,12 +3,15 @@ stdenv, fetchFromGitHub, fetchPnpmDeps, - pnpm, + pnpm_10, nodejs, pnpmConfigHook, nix-update-script, testers, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "skills"; version = "1.5.1"; @@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { fetcherVersion = 3; inherit (finalAttrs) pname version src; + inherit pnpm; hash = "sha256-0CS6BTjTj/TAnMNahTk4Vt/0/2eMxmCGUV9PwI8l4Ao="; }; diff --git a/pkgs/by-name/sl/slidev-cli/package.nix b/pkgs/by-name/sl/slidev-cli/package.nix index 1cf9d00585b2..a73a7378e8a5 100644 --- a/pkgs/by-name/sl/slidev-cli/package.nix +++ b/pkgs/by-name/sl/slidev-cli/package.nix @@ -3,11 +3,14 @@ stdenv, fetchFromGitHub, fetchPnpmDeps, - pnpm, + pnpm_10, nodejs, pnpmConfigHook, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "slidev-cli"; version = "52.15.1"; @@ -28,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src pnpmWorkspaces ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-DGDzNvau1XjPjkGZqcFZGkjYd3cneXO/gCdnwjjkQDY="; }; diff --git a/pkgs/by-name/sp/sparkle/package.nix b/pkgs/by-name/sp/sparkle/package.nix index 17bb24a7275d..bd10387d4e03 100644 --- a/pkgs/by-name/sp/sparkle/package.nix +++ b/pkgs/by-name/sp/sparkle/package.nix @@ -22,6 +22,8 @@ }: let + pnpm = pnpm_10_29_2; + sparkle-service = buildGoModule { pname = "sparkle-service"; version = "0-unstable-2025-10-24"; @@ -37,8 +39,6 @@ let meta.mainProgram = "sparkle-service"; }; - - pnpm = pnpm_10_29_2; in stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/su/sub-store-frontend/package.nix b/pkgs/by-name/su/sub-store-frontend/package.nix index 3de1b23a1b9e..0bb281c721b5 100644 --- a/pkgs/by-name/su/sub-store-frontend/package.nix +++ b/pkgs/by-name/su/sub-store-frontend/package.nix @@ -4,13 +4,14 @@ fetchFromGitHub, pnpm_10, - pnpm ? pnpm_10, fetchPnpmDeps, pnpmConfigHook, nix-update-script, nodejs, }: - +let + pnpm = pnpm_10; +in buildNpmPackage (finalAttrs: { pname = "sub-store-frontend"; version = "2.16.79"; diff --git a/pkgs/by-name/su/sub-store/package.nix b/pkgs/by-name/su/sub-store/package.nix index 8b7b2580f12a..b1f1587bcd10 100644 --- a/pkgs/by-name/su/sub-store/package.nix +++ b/pkgs/by-name/su/sub-store/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pnpm_10, - pnpm ? pnpm_10, fetchPnpmDeps, pnpmConfigHook, makeBinaryWrapper, @@ -12,7 +11,9 @@ nodejs, }: - +let + pnpm = pnpm_10; +in buildNpmPackage (finalAttrs: { pname = "sub-store"; version = "2.22.15"; diff --git a/pkgs/by-name/sv/svelte-check/package.nix b/pkgs/by-name/sv/svelte-check/package.nix index 98a09588b8f1..c2db29dcf953 100644 --- a/pkgs/by-name/sv/svelte-check/package.nix +++ b/pkgs/by-name/sv/svelte-check/package.nix @@ -4,11 +4,14 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, makeBinaryWrapper, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "svelte-check"; version = "4.3.1"; @@ -29,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { src pnpmWorkspaces ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-43AIkVzpcq/Y+QO2k7pkr6CN340idXJEpie0gVdxra8="; }; diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix index 533851c95ed9..4b35a31e042d 100644 --- a/pkgs/by-name/sv/svelte-language-server/package.nix +++ b/pkgs/by-name/sv/svelte-language-server/package.nix @@ -4,11 +4,14 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, makeBinaryWrapper, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "svelte-language-server"; version = "0.17.31"; @@ -29,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { src pnpmWorkspaces ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-x0yIANla1KURJ4fgxAe9WUJl/sPAsUcARubTJQ5uEpQ="; }; diff --git a/pkgs/by-name/ta/tabularis/package.nix b/pkgs/by-name/ta/tabularis/package.nix index 3668c683d48c..513d5fad50f6 100644 --- a/pkgs/by-name/ta/tabularis/package.nix +++ b/pkgs/by-name/ta/tabularis/package.nix @@ -6,7 +6,7 @@ fetchPnpmDeps, cargo-tauri, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, wrapGAppsHook4, webkitgtk_4_1, @@ -14,6 +14,9 @@ openssl, nix-update-script, }: +let + pnpm = pnpm_10; +in rustPlatform.buildRustPackage (finalAttrs: { pname = "tabularis"; version = "0.9.12"; @@ -38,6 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-S/XCypKyYlJtuISNiG8NtJzisAejiUwqPVltXEmVlZw="; }; diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix index 8ebb5226dd57..45ba2f5853f3 100644 --- a/pkgs/by-name/ty/typespec/package.nix +++ b/pkgs/by-name/ty/typespec/package.nix @@ -7,12 +7,14 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, versionCheckHook, }: let workspace = "@typespec/compiler..."; + + pnpm = pnpm_10; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "typespec"; @@ -41,6 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmWorkspaces postPatch ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-wZvnRSALrupyhpSN8zNL3b6SZnVPXX3BdHrbzHUNtUg="; }; diff --git a/pkgs/by-name/um/umami/package.nix b/pkgs/by-name/um/umami/package.nix index 058505f9846e..d5a95c25f349 100644 --- a/pkgs/by-name/um/umami/package.nix +++ b/pkgs/by-name/um/umami/package.nix @@ -9,7 +9,7 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, prisma_7, prisma-engines_7, openssl, @@ -20,6 +20,8 @@ basePath ? "", }: let + pnpm = pnpm_10; + sources = lib.importJSON ./sources.json; geocities = stdenvNoCC.mkDerivation { @@ -107,6 +109,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { version src ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-QNWmCsVFh8xpsO4ZPTaKGszwuRaxTrWLMVh/6VV5oIw="; }; diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index c0618fd6c98a..866e5c01d1b3 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -17,6 +17,9 @@ discord-development, buildWebExtension ? false, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "vencord"; version = "1.14.13"; @@ -42,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { patches postPatch ; - pnpm = pnpm_10; + inherit pnpm; fetcherVersion = 3; hash = "sha256-hk1rnNog5xvuIVI0M1ZJ5xrEuk0zcBiYsbROUycdi+A="; }; @@ -51,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { git nodejs pnpmConfigHook - pnpm_10 + pnpm ]; env = { diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index 06c129532f6c..0a09412135f4 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -4,11 +4,14 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, nix-update-script, makeBinaryWrapper, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "vue-language-server"; version = "3.2.6"; @@ -22,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-koRJkT/JloptmtQKLprqms53TL/Q4XHaktIl/6PIasw="; }; diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix index e51531e8ab94..a312f87604df 100644 --- a/pkgs/by-name/za/zashboard/package.nix +++ b/pkgs/by-name/za/zashboard/package.nix @@ -3,12 +3,13 @@ buildNpmPackage, fetchFromGitHub, pnpm_10, - pnpm ? pnpm_10, fetchPnpmDeps, pnpmConfigHook, nix-update-script, }: - +let + pnpm = pnpm_10; +in buildNpmPackage (finalAttrs: { pname = "zashboard"; version = "3.5.1"; diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix index 9dd305b3ad37..c98095bd08a1 100644 --- a/pkgs/development/python-modules/django-filingcabinet/default.nix +++ b/pkgs/development/python-modules/django-filingcabinet/default.nix @@ -31,12 +31,14 @@ playwright-driver, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, markdown, nh3, }: - +let + pnpm = pnpm_10; +in buildPythonPackage rec { pname = "django-filingcabinet"; version = "0.17-unstable-2025-08-14"; @@ -96,7 +98,12 @@ buildPythonPackage rec { }; pnpmDeps = fetchPnpmDeps { - inherit pname version src; + inherit + pname + version + src + pnpm + ; fetcherVersion = 3; hash = "sha256-p+RpEDVbdYmeSD4bB0oUMrTpsVDGYkqME13awnoTNd0="; }; diff --git a/pkgs/development/python-modules/yt-dlp-ejs/default.nix b/pkgs/development/python-modules/yt-dlp-ejs/default.nix index 4157f6d99236..d53cade836be 100644 --- a/pkgs/development/python-modules/yt-dlp-ejs/default.nix +++ b/pkgs/development/python-modules/yt-dlp-ejs/default.nix @@ -7,9 +7,11 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, }: - +let + pnpm = pnpm_10; +in buildPythonPackage rec { pname = "yt-dlp-ejs"; version = "0.8.0"; @@ -27,6 +29,7 @@ buildPythonPackage rec { pname version src + pnpm ; fetcherVersion = 3; hash = "sha256-4qMOAl9Dbe1oYSRIeP7oPcV/+P8NLdIYvSNxaz0h+Z0="; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix index 31197106a149..a4b8f9312f3e 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix @@ -5,10 +5,12 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, }: let common = callPackage ./common.nix { }; + + pnpm = pnpm_10; in stdenv.mkDerivation (finalAttrs: { pname = "woodpecker-webui"; @@ -18,6 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; sourceRoot = "${common.src.name}/web"; fetcherVersion = 3; hash = common.nodeModulesHash; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix index 1d3bf1706612..935a7bdba7d4 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix @@ -4,10 +4,12 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, }: - +let + pnpm = pnpm_10; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "custom-sidebar"; version = "14.0.0"; @@ -21,6 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-gYNCjCeAt6LP4tZE4ufiQu7OG2ujWydm4etcGQxMxcU="; }; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix index 7b29dd502564..f85502db309a 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix @@ -4,10 +4,12 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, }: - +let + pnpm = pnpm_10; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "kiosk-mode"; version = "13.1.0"; @@ -21,6 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-k7kXZ4yFe3As1IGijrmJfgqrMoO2Yi+PrNapuq8Ow3Y="; }; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 5c572d71511d..96aba467b7be 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -39,7 +39,7 @@ buildRubyGem, rustc, cargo, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, svgo, @@ -62,6 +62,8 @@ let sha256 = "sha256-0jbO1rJQ0AISo7h+SZfovubReCjR2zT6KWX9LxBeFtE="; }; + pnpm = pnpm_10; + ruby = ruby_3_3; runtimeDeps = [ @@ -303,8 +305,7 @@ let pnpmDeps = fetchPnpmDeps { pname = "discourse-assets"; - inherit version src; - pnpm = pnpm; + inherit version src pnpm; fetcherVersion = 3; hash = "sha256-xft/2x0iti0yJ53uI9q2+FSvKgWWfKQzlMlPFz3RZsE="; };