From 39cd3b6172faba8b3fb1caa96ebc54acda419545 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 27 May 2026 12:05:27 +0200 Subject: [PATCH 1/5] logseq: remove double dependencies on nodejs+nodejs-slim --- pkgs/by-name/lo/logseq/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index b00e0193c009..2bf9f5527f74 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -14,7 +14,6 @@ darwin, makeDesktopItem, makeWrapper, - nodejs, nodejs-slim, removeReferencesTo, yarnBuildHook, @@ -151,7 +150,8 @@ stdenv.mkDerivation (finalAttrs: { copyDesktopItems fakeGit makeWrapper - nodejs + nodejs-slim + nodejs-slim.npm (nodejs-slim.python.withPackages (ps: [ ps.setuptools ])) removeReferencesTo yarnBuildHook @@ -200,7 +200,7 @@ stdenv.mkDerivation (finalAttrs: { yarn --offline --cwd tldraw postinstall - export npm_config_nodedir=${nodejs} + export npm_config_nodedir=${nodejs-slim} pushd packages/amplify npm rebuild --verbose popd @@ -247,7 +247,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall # remove references to nodejs - find static/out/*/resources/app/node_modules -type f -executable -exec remove-references-to -t ${nodejs} '{}' \; + find static/out/*/resources/app/node_modules -type f -executable -exec remove-references-to -t ${nodejs-slim} '{}' \; '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm644 static/icons/logseq.png "$out/share/icons/hicolor/512x512/apps/logseq.png" From 72029f9368fe5832b416d241e77b20c92229bf9a Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 27 May 2026 12:06:34 +0200 Subject: [PATCH 2/5] vscode-extensions.ms-vscode.js-debug: remove double nodejs dependency --- .../editors/vscode/extensions/ms-vscode.js-debug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix index 80544534894c..591be36c5c44 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.js-debug/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, fetchNpmDeps, - nodejs, nodejs-slim, npmHooks, pkg-config, @@ -38,7 +37,8 @@ let libsecret ]; nativeBuildInputs = [ - nodejs + nodejs-slim + nodejs-slim.npm nodejs-slim.python npmHooks.npmConfigHook ] From 4943b95e8ce5e801880ddc59d7bddaece00540b6 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 27 May 2026 12:06:52 +0200 Subject: [PATCH 3/5] vscode-extensions.prettier.prettier-vscode: remove double nodejs dependency --- .../vscode/extensions/prettier.prettier-vscode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix index 41fdc17e69f4..f77a65d1a93d 100644 --- a/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, fetchNpmDeps, libsecret, - nodejs, nodejs-slim, npmHooks, pkg-config, @@ -37,7 +36,8 @@ let ]; nativeBuildInputs = [ - nodejs + nodejs-slim + nodejs-slim.npm nodejs-slim.python npmHooks.npmConfigHook ] From 8bd4119182cec66df29661bea215828c4f448556 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 27 May 2026 12:07:16 +0200 Subject: [PATCH 4/5] buildNpmPackage: remove double dependencies on nodejs+nodejs-slim --- pkgs/build-support/node/build-npm-package/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 0645432a0df6..1e316d1be9c6 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -4,7 +4,6 @@ fetchNpmDeps, buildPackages, nodejs, - nodejs-slim, cctools, }@topLevelArgs: @@ -102,7 +101,7 @@ lib.extendMkDerivation { (if npmConfigHook != null then npmConfigHook else npmHooks.npmConfigHook) (if npmBuildHook != null then npmBuildHook else npmHooks.npmBuildHook) (if npmInstallHook != null then npmInstallHook else npmHooks.npmInstallHook) - nodejs-slim.python + nodejs.python ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = buildInputs ++ [ nodejs ]; From 617b299a404798ae97693a08cb4e6aad32ce6410 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 27 May 2026 12:08:02 +0200 Subject: [PATCH 5/5] fetch-yarn-deps: remove unused `nodejs` argument --- pkgs/build-support/node/fetch-yarn-deps/default.nix | 1 - pkgs/by-name/ma/matrix-appservice-discord/package.nix | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/node/fetch-yarn-deps/default.nix b/pkgs/build-support/node/fetch-yarn-deps/default.nix index fefb40db0176..19b7eeaee7a5 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/default.nix +++ b/pkgs/build-support/node/fetch-yarn-deps/default.nix @@ -9,7 +9,6 @@ nix-prefetch-git, fetchurl, jq, - nodejs, nodejs-slim, prefetch-yarn-deps, fixup-yarn-lock, diff --git a/pkgs/by-name/ma/matrix-appservice-discord/package.nix b/pkgs/by-name/ma/matrix-appservice-discord/package.nix index a397c6226bde..7330ecea5b45 100644 --- a/pkgs/by-name/ma/matrix-appservice-discord/package.nix +++ b/pkgs/by-name/ma/matrix-appservice-discord/package.nix @@ -25,11 +25,11 @@ let nodejs = nodejs_20; }; yarnConfigHook' = yarnConfigHook.override { - nodejs = nodejs_20; + nodejs-slim = nodejs_20; yarn = yarn'; }; yarnBuildHook' = yarnBuildHook.override { - nodejs = nodejs_20; + nodejs-slim = nodejs_20; yarn = yarn'; }; matrix-sdk-crypto-nodejs' = matrix-sdk-crypto-nodejs.override {