From e0019c44037649e11ff970fa175b2567dd6298bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Nov 2022 23:33:58 +0100 Subject: [PATCH] Update nodejs package attr to fit https://github.com/NixOS/nixpkgs/pull/199835 --- bin/node2nix.js | 10 +++++----- tests/default-v14.nix | 2 +- tests/default-v16.nix | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/node2nix.js b/bin/node2nix.js index a04b6d5..18ab561 100755 --- 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 index e528025..52f49c3 100644 --- a/tests/default-v14.nix +++ b/tests/default-v14.nix @@ -2,7 +2,7 @@ {pkgs ? import { 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 index 8c1f04a..faed39d 100644 --- a/tests/default-v16.nix +++ b/tests/default-v16.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_16"}: let nodeEnv = import ../nix/node-env.nix {