From 201ccf894a7665098b49d031503ec7d1a79251ba Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 25 Mar 2026 15:50:18 +0100 Subject: [PATCH] treewide: fix mentions for nodejs.python --- .../vscode/extensions/ms-vscode.js-debug/default.nix | 3 ++- .../extensions/prettier.prettier-vscode/default.nix | 3 ++- pkgs/build-support/node/build-npm-package/default.nix | 3 ++- pkgs/by-name/az/azurite/package.nix | 4 ++-- pkgs/by-name/ch/cherry-studio/package.nix | 6 +++--- pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 7 ++++--- pkgs/by-name/fi/firefly-iii/package.nix | 6 +++--- pkgs/by-name/ga/gancio/package.nix | 4 ++-- pkgs/by-name/ko/koodo-reader/package.nix | 9 +++++---- pkgs/by-name/lo/logseq/package.nix | 3 ++- pkgs/by-name/op/openvscode-server/package.nix | 3 ++- pkgs/by-name/re/redisinsight/package.nix | 4 ++-- pkgs/by-name/rs/rstudio/package.nix | 10 +++++----- pkgs/by-name/sm/smtp4dev/package.nix | 7 ++++--- pkgs/by-name/vs/vsce/package.nix | 4 ++-- 15 files changed, 42 insertions(+), 34 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 6b516d577745..4167d10fc380 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 @@ -4,6 +4,7 @@ fetchFromGitHub, fetchNpmDeps, nodejs, + nodejs-slim, npmHooks, pkg-config, libsecret, @@ -38,7 +39,7 @@ let ]; nativeBuildInputs = [ nodejs - nodejs.python + nodejs-slim.python npmHooks.npmConfigHook ] ++ lib.optionals stdenv.isLinux [ 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 37535f13c86e..2b4644a8502b 100644 --- a/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/prettier.prettier-vscode/default.nix @@ -5,6 +5,7 @@ fetchNpmDeps, libsecret, nodejs, + nodejs-slim, npmHooks, pkg-config, clang_20, @@ -37,7 +38,7 @@ let nativeBuildInputs = [ nodejs - nodejs.python + nodejs-slim.python npmHooks.npmConfigHook ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 1e316d1be9c6..0645432a0df6 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -4,6 +4,7 @@ fetchNpmDeps, buildPackages, nodejs, + nodejs-slim, cctools, }@topLevelArgs: @@ -101,7 +102,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.python + nodejs-slim.python ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = buildInputs ++ [ nodejs ]; diff --git a/pkgs/by-name/az/azurite/package.nix b/pkgs/by-name/az/azurite/package.nix index 1069a16f4b13..a46a7c0b8f64 100644 --- a/pkgs/by-name/az/azurite/package.nix +++ b/pkgs/by-name/az/azurite/package.nix @@ -5,7 +5,7 @@ clang_20, fetchFromGitHub, libsecret, - nodejs, + nodejs-slim, pkg-config, }: @@ -24,7 +24,7 @@ buildNpmPackage (finalAttrs: { nativeBuildInputs = [ pkg-config - nodejs.python + nodejs-slim.python ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optional dependency keytar diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index 0d9c30858ca1..8414541f70c9 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchPnpmDeps, electron_40, - nodejs, + nodejs-slim, pnpm_10_29_2, pnpmConfigHook, makeWrapper, @@ -58,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - nodejs - (nodejs.python.withPackages (ps: with ps; [ setuptools ])) + nodejs-slim + (nodejs-slim.python.withPackages (ps: with ps; [ setuptools ])) pnpm pnpmConfigHook makeWrapper diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index f1098d2df592..122ae79a9dfa 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, stdenvNoCC, - nodejs, + nodejs-slim, fetchNpmDeps, buildPackages, php84, @@ -25,8 +25,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildInputs = [ php84 ]; nativeBuildInputs = [ - nodejs - nodejs.python + nodejs-slim + nodejs-slim.npm + nodejs-slim.python buildPackages.npmHooks.npmConfigHook php84.composerHooks.composerInstallHook php84.packages.composer-local-repo-plugin diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index b1a0cbb09faa..af4d2d9866d3 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, stdenvNoCC, - nodejs, + nodejs-slim, fetchNpmDeps, buildPackages, php84, @@ -25,8 +25,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildInputs = [ php84 ]; nativeBuildInputs = [ - nodejs - nodejs.python + nodejs-slim + nodejs-slim.python buildPackages.npmHooks.npmConfigHook php84.packages.composer php84.composerHooks2.composerInstallHook diff --git a/pkgs/by-name/ga/gancio/package.nix b/pkgs/by-name/ga/gancio/package.nix index 26447e7ca255..f8b625dfb52a 100644 --- a/pkgs/by-name/ga/gancio/package.nix +++ b/pkgs/by-name/ga/gancio/package.nix @@ -8,7 +8,7 @@ yarnConfigHook, yarnBuildHook, yarnInstallHook, - nodejs_22, + nodejs-slim_22, pkg-config, vips, @@ -21,7 +21,7 @@ let # The latest nodejs is always used in yarn, leading to build issues when it's # different from the pinned one. - nodejs = nodejs_22; + nodejs = nodejs-slim_22; yarnConfigHook' = yarnConfigHook.override { yarn = yarn.override { inherit nodejs; }; }; diff --git a/pkgs/by-name/ko/koodo-reader/package.nix b/pkgs/by-name/ko/koodo-reader/package.nix index c1013d200b71..1a9009d5d59b 100644 --- a/pkgs/by-name/ko/koodo-reader/package.nix +++ b/pkgs/by-name/ko/koodo-reader/package.nix @@ -8,7 +8,7 @@ copyDesktopItems, cctools, makeWrapper, - nodejs, + nodejs-slim, yarnConfigHook, yarnBuildHook, wrapGAppsHook3, @@ -44,8 +44,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper - nodejs - (nodejs.python.withPackages (ps: [ ps.setuptools ])) + nodejs-slim + nodejs-slim.npm + (nodejs-slim.python.withPackages (ps: [ ps.setuptools ])) yarnConfigHook yarnBuildHook ] @@ -65,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { chmod -R u+w electron-dist # we need to build cpu-features with the non-electron headers first - export npm_config_nodedir=${nodejs} + export npm_config_nodedir=${nodejs-slim} npm rebuild --verbose cpu-features export npm_config_nodedir=${electron.headers} diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index 6c55dbaebded..abb736643a60 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -15,6 +15,7 @@ makeDesktopItem, makeWrapper, nodejs, + nodejs-slim, removeReferencesTo, yarnBuildHook, yarnConfigHook, @@ -148,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { fakeGit makeWrapper nodejs - (nodejs.python.withPackages (ps: [ ps.setuptools ])) + (nodejs-slim.python.withPackages (ps: [ ps.setuptools ])) removeReferencesTo yarnBuildHook yarnConfigHook diff --git a/pkgs/by-name/op/openvscode-server/package.nix b/pkgs/by-name/op/openvscode-server/package.nix index 55375fa981ab..074d42c058e5 100644 --- a/pkgs/by-name/op/openvscode-server/package.nix +++ b/pkgs/by-name/op/openvscode-server/package.nix @@ -11,6 +11,7 @@ pkg-config, runCommand, nodejs_22, + nodejs-slim_22, node-gyp, libsecret, libkrb5, @@ -100,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ nodejs - nodejs.python + nodejs-slim_22.python pkg-config makeWrapper git diff --git a/pkgs/by-name/re/redisinsight/package.nix b/pkgs/by-name/re/redisinsight/package.nix index 9e60587cda32..88cba1ea6928 100644 --- a/pkgs/by-name/re/redisinsight/package.nix +++ b/pkgs/by-name/re/redisinsight/package.nix @@ -9,7 +9,7 @@ copyDesktopItems, dart-sass, makeWrapper, - nodejs_20, + nodejs-slim_20, pkg-config, yarnConfigHook, @@ -19,7 +19,7 @@ }: let - nodejs = nodejs_20; + nodejs = nodejs-slim_20; in stdenv.mkDerivation (finalAttrs: { pname = "redisinsight"; diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix index a532f4e27a33..77838da0eec0 100644 --- a/pkgs/by-name/rs/rstudio/package.nix +++ b/pkgs/by-name/rs/rstudio/package.nix @@ -17,7 +17,7 @@ git, jdk, makeWrapper, - nodejs, + nodejs-slim, npmHooks, xcbuild, yarn, @@ -135,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: { ant jdk - nodejs + nodejs-slim yarn yarnConfigHook zip @@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!server) [ makeWrapper - (nodejs.python.withPackages (ps: [ ps.setuptools ])) + (nodejs-slim.python.withPackages (ps: [ ps.setuptools ])) npmHooks.npmConfigHook ]; @@ -289,8 +289,8 @@ stdenv.mkDerivation (finalAttrs: { RSTUDIO_INSTALLED_NODE_VERSION="22.21.1" mkdir -p dependencies/common/node - ln -s ${nodejs} dependencies/common/node/$RSTUDIO_NODE_VERSION - ln -s ${nodejs} dependencies/common/node/$RSTUDIO_INSTALLED_NODE_VERSION-installed + ln -s ${nodejs-slim} dependencies/common/node/$RSTUDIO_NODE_VERSION + ln -s ${nodejs-slim} dependencies/common/node/$RSTUDIO_INSTALLED_NODE_VERSION-installed '' + lib.optionalString (!server) '' diff --git a/pkgs/by-name/sm/smtp4dev/package.nix b/pkgs/by-name/sm/smtp4dev/package.nix index 5a5242481e10..688c80cb603b 100644 --- a/pkgs/by-name/sm/smtp4dev/package.nix +++ b/pkgs/by-name/sm/smtp4dev/package.nix @@ -3,7 +3,7 @@ stdenv, buildDotnetModule, fetchFromGitHub, - nodejs, + nodejs-slim, npmHooks, fetchNpmDeps, dotnetCorePackages, @@ -23,8 +23,9 @@ buildDotnetModule (finalAttrs: { patches = [ ./smtp4dev-npm-packages.patch ]; nativeBuildInputs = [ - nodejs - nodejs.python + nodejs-slim + nodejs-slim.npm + nodejs-slim.python npmHooks.npmConfigHook stdenv.cc # c compiler is needed for compiling npm-deps ]; diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix index 2a44db230520..5c6713883364 100644 --- a/pkgs/by-name/vs/vsce/package.nix +++ b/pkgs/by-name/vs/vsce/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, pkg-config, libsecret, - nodejs, + nodejs-slim, clang_20, versionCheckHook, nix-update-script, @@ -30,7 +30,7 @@ buildNpmPackage (finalAttrs: { nativeBuildInputs = [ pkg-config - nodejs.python + nodejs-slim.python ] ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks @vscode/vsce's optional dependency keytar