treewide: override pnpm nodejs versions

Some packages in nixpkgs were using different nodejs versions, but were
not overriding pnpm to match. Apart from reducing the derivation size,
this could prevent future issues due to version mismatches.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu
2025-12-18 12:24:09 +01:00
parent 63cdea5359
commit 8915343708
10 changed files with 41 additions and 24 deletions
@@ -12,6 +12,7 @@
}:
let
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_24; };
pnpm' = pnpm_9.override { nodejs = nodejs_24; };
in
buildNpmPackage' (finalAttrs: {
pname = "claude-code-router";
@@ -32,7 +33,7 @@ buildNpmPackage' (finalAttrs: {
npmDeps = null;
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname src;
pnpm = pnpm_9;
pnpm = pnpm';
fetcherVersion = 2;
hash = "sha256-BLPGTbDvvI40kuXfE/p3+s9hkE0reXr7OJA6UGXN4ys=";
};
@@ -40,7 +41,7 @@ buildNpmPackage' (finalAttrs: {
nativeBuildInputs = [
esbuild
makeBinaryWrapper
pnpm_9
pnpm'
];
npmConfigHook = pnpmConfigHook;
@@ -81,13 +82,13 @@ buildNpmPackage' (finalAttrs: {
npmDeps = null;
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs') pname src sourceRoot;
pnpm = pnpm_9;
pnpm = pnpm';
fetcherVersion = 2;
hash = "sha256-ZjYLUec9EADQmKfju8hMbq0y4f1TDVwjbe3yw8Gh4Ac=";
};
nativeBuildInputs = [
pnpm_9
pnpm'
];
npmConfigHook = pnpmConfigHook;
+3 -2
View File
@@ -33,6 +33,7 @@
}:
let
pnpm' = pnpm_10.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=";
@@ -64,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_10;
pnpm = pnpm';
fetcherVersion = 2;
prePnpmInstall = ''
export PATH=$PATH:${gitMinimal}/bin
@@ -76,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
autoPatchelfHook
gobject-introspection
pnpmConfigHook
pnpm_10
pnpm'
makeWrapper
nodejs_20
];
+5 -4
View File
@@ -12,6 +12,9 @@
discord-canary,
discord-development,
}:
let
pnpm' = pnpm_10.override { nodejs = nodejs_22; };
in
stdenv.mkDerivation (finalAttrs: {
pname = "moonlight";
version = "1.3.33";
@@ -26,14 +29,12 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
nodejs_22
pnpmConfigHook
pnpm_10
pnpm'
];
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_10;
buildInputs = [ nodejs_22 ];
pnpm = pnpm';
fetcherVersion = 2;
hash = "sha256-PRlgwyePFpFdQRcojGDEC4ESZEGTJf1Ad9EFgm8hmKY=";
+5 -2
View File
@@ -19,7 +19,7 @@
unpaper,
fetchPnpmDeps,
pnpmConfigHook,
pnpm,
pnpm_10,
poppler-utils,
liberation_ttf,
xcbuild,
@@ -61,6 +61,8 @@ let
};
};
pnpm' = pnpm_10.override { nodejs = nodejs_20; };
path = lib.makeBinPath [
ghostscript_headless
(imagemagickBig.override { ghostscript = ghostscript_headless; })
@@ -81,6 +83,7 @@ let
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm';
fetcherVersion = 2;
hash = "sha256-pG7olcBq5P52CvZYLqUjb+RwxjbQbSotlS50pvgm7WQ=";
};
@@ -90,7 +93,7 @@ let
nodejs_20
pkg-config
pnpmConfigHook
pnpm
pnpm'
python3
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
+3 -2
View File
@@ -38,6 +38,7 @@ let
};
};
nodejs = nodejs_22;
pnpm' = pnpm_9.override { nodejs = nodejs_22; };
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "porn-vault";
@@ -52,7 +53,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_9;
pnpm = pnpm';
fetcherVersion = 1;
hash = "sha256-Xr9tRiP1hW+aFs9FnPvPkeJ0/LtJI57cjWY5bZQaRTQ=";
};
@@ -60,7 +61,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
nativeBuildInputs = [
nodejs
pnpmConfigHook
pnpm_9
pnpm'
makeWrapper
];
@@ -17,6 +17,7 @@
let
# NodeJS 22.18.0 broke our build, not sure why
wails' = wails.override { nodejs = nodejs_20; };
pnpm' = pnpm_8.override { nodejs = nodejs_20; };
in
buildGoModule rec {
pname = "satisfactorymodmanager";
@@ -45,7 +46,7 @@ buildGoModule rec {
nativeBuildInputs = [
pnpmConfigHook
pnpm_8
pnpm'
wails'
wrapGAppsHook3
copyDesktopItems
@@ -64,7 +65,7 @@ buildGoModule rec {
version
src
;
pnpm = pnpm_8;
pnpm = pnpm';
sourceRoot = "${src.name}/frontend";
fetcherVersion = 1;
hash = "sha256-OP+3zsNlvqLFwvm2cnBd2bj2Kc3EghQZE3hpotoqqrQ=";
@@ -18,6 +18,7 @@
}:
let
nodeSources = srcOnly nodejs_20;
pnpm' = pnpm_9.override { nodejs = nodejs_20; };
esbuild' = esbuild.override {
buildGoModule =
args:
@@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
customPython
nodejs_20
pnpmConfigHook
pnpm_9
pnpm'
gitMinimal
jq
zip
@@ -59,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_9;
pnpm = pnpm';
fetcherVersion = 1;
hash = "sha256-pLe5smsXdzSBgz/OYNO5FVEI2L6y/p+jMxEkzqUaX34=";
};
+5 -2
View File
@@ -8,6 +8,9 @@
nodejs_22,
versionCheckHook,
}:
let
pnpm' = pnpm_9.override { nodejs = nodejs_22; };
in
stdenv.mkDerivation rec {
pname = "tsx";
version = "4.19.3";
@@ -25,7 +28,7 @@ stdenv.mkDerivation rec {
version
src
;
pnpm = pnpm_9;
pnpm = pnpm';
fetcherVersion = 1;
hash = "sha256-57KDZ9cHb7uqnypC0auIltmYMmIhs4PWyf0HTRWEFiU=";
};
@@ -33,7 +36,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
nodejs_22
pnpmConfigHook
pnpm_9
pnpm'
];
buildInputs = [
+5 -2
View File
@@ -10,6 +10,9 @@
pnpmConfigHook,
nix-update-script,
}:
let
pnpm' = pnpm_8.override { nodejs = nodejs_22; };
in
stdenv.mkDerivation (finalAttrs: {
pname = "vtsls";
version = "0.2.9";
@@ -28,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
gitMinimal
gitSetupHook
pnpmConfigHook
pnpm_8
pnpm'
];
buildInputs = [ nodejs_22 ];
@@ -42,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
src
version
;
pnpm = pnpm_8;
pnpm = pnpm';
fetcherVersion = 1;
hash = "sha256-SdqeTYRH60CyU522+nBo0uCDnzxDP48eWBAtGTL/pqg=";
};
+4 -2
View File
@@ -30,6 +30,8 @@ let
PRISMA_INTROSPECTION_ENGINE_BINARY = lib.getExe' prisma-engines "introspection-engine";
PRISMA_FMT_BINARY = lib.getExe' prisma-engines "prisma-fmt";
};
pnpm' = pnpm_10.override { nodejs = nodejs_24; };
in
stdenv.mkDerivation (finalAttrs: {
@@ -50,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_10;
pnpm = pnpm';
fetcherVersion = 2;
hash = "sha256-i5unHz7Hs9zvnjgLwHJaoFdM2z/5ucXZG8eouko1Res=";
};
@@ -62,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
pnpmConfigHook
pnpm_10
pnpm'
nodejs_24
makeWrapper
# for sharp build: