nodejs*: normalise names to better fit other packages

Versioned package attributes are usually named like $pname_$version
eg: nodejs-14_x -> nodejs_14

11 files changed, 17 insertions, 17 deletions

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 8ebe0d816de..69f88d3aaf4 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -3,7 +3,7 @@
 let
 
   # To control nodejs version we pass down
-  nodejs = pkgs.nodejs-14_x;
+  nodejs = pkgs.nodejs_14;
 
   fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { };
 
@@ -116,7 +116,7 @@ let
 
   nodePkgs = pkgs.callPackage ./packages/node-composition.nix {
     inherit pkgs;
-    nodejs = pkgs.nodejs-14_x;
+    nodejs = pkgs.nodejs_14;
     inherit (pkgs.stdenv.hostPlatform) system;
   };
 
diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix
index bbb39db07b7..b6110ac4db9 100644
--- a/pkgs/development/compilers/elm/packages/node-composition.nix
+++ b/pkgs/development/compilers/elm/packages/node-composition.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
 
 let
   nodeEnv = import ../../../node-packages/node-env.nix {
diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix
index 6bbc431049e..d9c0daef783 100644
--- a/pkgs/development/node-packages/composition.nix
+++ b/pkgs/development/node-packages/composition.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:
 
 let
   nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh
index bee53d7a1e6..1a65ebd6cd2 100755
--- a/pkgs/development/node-packages/generate.sh
+++ b/pkgs/development/node-packages/generate.sh
@@ -13,7 +13,7 @@ rm -f ./node-env.nix
     -i node-packages.json \
     -o node-packages.nix \
     -c composition.nix \
-    --pkg-name nodejs-18_x
+    --pkg-name nodejs_18
 
 # using --no-out-link in nix-build argument would cause the
 # gc to run before the script finishes
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index a1957bf935a..a4acdc0d1c4 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -281,7 +281,7 @@ final: prev: {
   };
 
   manta = prev.manta.override ( oldAttrs: {
-    nativeBuildInputs = with pkgs; [ nodejs-14_x installShellFiles ];
+    nativeBuildInputs = with pkgs; [ nodejs_14 installShellFiles ];
     postInstall = ''
       # create completions, following upstream procedure https://github.com/joyent/node-manta/blob/v5.2.3/Makefile#L85-L91
       completion_cmds=$(find ./bin -type f -printf "%f\n")
diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix
index 36931247d12..6774499d8cc 100644
--- a/pkgs/development/tools/continuous-integration/github-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix
@@ -9,7 +9,7 @@
 , glibcLocales
 , lib
 , nixosTests
-, nodejs-16_x
+, nodejs_16
 , stdenv
 , which
 }:
@@ -156,7 +156,7 @@ buildDotnetModule rec {
 
   preCheck = ''
     mkdir -p _layout/externals
-    ln -s ${nodejs-16_x} _layout/externals/node16
+    ln -s ${nodejs_16} _layout/externals/node16
   '';
 
   postInstall = ''
@@ -193,7 +193,7 @@ buildDotnetModule rec {
     # externals/node16. As opposed to the official releases, we don't
     # link the Alpine Node flavors.
     mkdir -p $out/lib/externals
-    ln -s ${nodejs-16_x} $out/lib/externals/node16
+    ln -s ${nodejs_16} $out/lib/externals/node16
 
     # Install Nodejs scripts called from workflows
     install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js
diff --git a/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/development/tools/electron-fiddle/default.nix
index f0ce8ce7686..102c3cbaf31 100644
--- a/pkgs/development/tools/electron-fiddle/default.nix
+++ b/pkgs/development/tools/electron-fiddle/default.nix
@@ -6,7 +6,7 @@
 , git
 , lib
 , makeDesktopItem
-, nodejs-16_x
+, nodejs_16
 , stdenvNoCC
 , util-linux
 , zip
@@ -16,7 +16,7 @@ let
   pname = "electron-fiddle";
   version = "0.32.1";
   electron = electron_22;
-  nodejs = nodejs-16_x;
+  nodejs = nodejs_16;
 
   src = fetchFromGitHub {
     owner = "electron";
diff --git a/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix b/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix
index 98375eef01c..53581e0c1d3 100644
--- a/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix
+++ b/pkgs/development/tools/language-servers/docker-compose-language-service/default.nix
@@ -1,10 +1,10 @@
 { lib
 , buildNpmPackage
-, nodejs-16_x
+, nodejs_16
 , fetchFromGitHub
 }:
 let
-  buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; };
+  buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; };
 in
 buildNpmPackage' rec {
   pname = "docker-compose-language-service";
diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix
index fa58d1fbbf4..69aa71a6f24 100644
--- a/pkgs/development/tools/misc/kibana/7.x.nix
+++ b/pkgs/development/tools/misc/kibana/7.x.nix
@@ -4,13 +4,13 @@
 , stdenv
 , makeWrapper
 , fetchurl
-, nodejs-16_x
+, nodejs_16
 , coreutils
 , which
 }:
 
 let
-  nodejs = nodejs-16_x;
+  nodejs = nodejs_16;
   inherit (builtins) elemAt;
   info = lib.splitString "-" stdenv.hostPlatform.system;
   arch = elemAt info 0;
diff --git a/pkgs/development/web/netlify-cli/composition.nix b/pkgs/development/web/netlify-cli/composition.nix
index ca76a98f5a6..6377a4b2c12 100644
--- a/pkgs/development/web/netlify-cli/composition.nix
+++ b/pkgs/development/web/netlify-cli/composition.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_16"}:
 
 let
   nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/web/newman/node-composition.nix b/pkgs/development/web/newman/node-composition.nix
index 08f947ea46b..b795f708f18 100644
--- a/pkgs/development/web/newman/node-composition.nix
+++ b/pkgs/development/web/newman/node-composition.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
 
 let
   nodeEnv = import ./node-env.nix {