Update nodejs package attr to fit NixOS/nixpkgs#199835

svanderburg · Nov 27, 2022 · e0019c4 · e0019c4
1 parent a6041f6
commit e0019c4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/bin/node2nix.js b/bin/node2nix.js
@@ -138,14 +138,14 @@ parser.on('nodejs-8', function(arg, value) {
 
 parser.on('nodejs-10', function(arg, value) {
     flatten = true;
-    nodePackage = "nodejs-10_x";
+    nodePackage = "nodejs_10";
     bypassCache = true;
     includePeerDependencies = false;
 });
 
 parser.on('nodejs-12', function(arg, value) {
     flatten = true;
-    nodePackage = "nodejs-12_x";
+    nodePackage = "nodejs_12";
     bypassCache = true;
     includePeerDependencies = false;
 });
@@ -159,14 +159,14 @@ parser.on('nodejs-13', function(arg, value) {
 
 parser.on('nodejs-14', function(arg, value) {
     flatten = true;
-    nodePackage = "nodejs-14_x";
+    nodePackage = "nodejs_14";
     bypassCache = true;
     includePeerDependencies = false;
 });
 
 parser.on('nodejs-16', function(arg, value) {
     flatten = true;
-    nodePackage = "nodejs-16_x";
+    nodePackage = "nodejs_16";
     bypassCache = true;
     includePeerDependencies = true;
 });
@@ -180,7 +180,7 @@ parser.on('nodejs-17', function(arg, value) {
 
 parser.on('nodejs-18', function(arg, value) {
     flatten = true;
-    nodePackage = "nodejs-18_x";
+    nodePackage = "nodejs_18";
     bypassCache = true;
     includePeerDependencies = true;
 });

diff --git a/tests/default-v14.nix b/tests/default-v14.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 ../nix/node-env.nix {

diff --git a/tests/default-v16.nix b/tests/default-v16.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 ../nix/node-env.nix {