From 25afafe25b6f39f8e26101c43d09956ca90b8331 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Fri, 16 Jun 2023 11:27:05 -0700 Subject: [PATCH 1/2] Revert "treewide: fix nodejs-18_x references" This reverts commit 0912ad928f862e2e901f509e6b84c19dc930095d. --- pkgs/servers/psitransfer/node-composition.nix | 2 +- pkgs/tools/security/onlykey/onlykey.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/psitransfer/node-composition.nix b/pkgs/servers/psitransfer/node-composition.nix index 7b360d03dcf08..a923391dfbeda 100644 --- a/pkgs/servers/psitransfer/node-composition.nix +++ b/pkgs/servers/psitransfer/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs_18}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/security/onlykey/onlykey.nix b/pkgs/tools/security/onlykey/onlykey.nix index 22e8b62607378..a8d2bdfe511c1 100644 --- a/pkgs/tools/security/onlykey/onlykey.nix +++ b/pkgs/tools/security/onlykey/onlykey.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs_18}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { From 1cb5ea4f1d2f6d3eaff510ead31937866a48e4fa Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Fri, 16 Jun 2023 12:09:07 -0700 Subject: [PATCH 2/2] Revert "Revert "treewide: fix nodejs-18_x references"" This reverts commit 25afafe25b6f39f8e26101c43d09956ca90b8331. --- pkgs/servers/psitransfer/node-composition.nix | 2 +- pkgs/tools/security/onlykey/onlykey.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/psitransfer/node-composition.nix b/pkgs/servers/psitransfer/node-composition.nix index a923391dfbeda..7b360d03dcf08 100644 --- a/pkgs/servers/psitransfer/node-composition.nix +++ b/pkgs/servers/psitransfer/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs_18}: let nodeEnv = import ../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/security/onlykey/onlykey.nix b/pkgs/tools/security/onlykey/onlykey.nix index a8d2bdfe511c1..22e8b62607378 100644 --- a/pkgs/tools/security/onlykey/onlykey.nix +++ b/pkgs/tools/security/onlykey/onlykey.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs.nodejs_18}: let nodeEnv = import ../../../development/node-packages/node-env.nix {