From 358fb704bac4b6459383fdf8c28d0ad3b4283c31 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 23 Apr 2025 15:32:59 +0200 Subject: [PATCH] nodejs_18: fix aliases --- pkgs/top-level/aliases.nix | 3 +++ pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 64052c41fd93..af47cb7300fd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1287,6 +1287,9 @@ mapAliases { nixosTest = testers.nixosTest; # Added 2022-05-05 nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17 + nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23 + nodejs-slim_18 = nodejs_18; # Added 2025-04-23 + corepack_18 = nodejs_18; # Added 2025-04-23 nodejs-18_x = nodejs_18; # Added 2022-11-06 nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 nomad_1_4 = throw "nomad_1_4 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c61658d858f..ce35fc6c5a5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4165,10 +4165,6 @@ with pkgs; nodejs-slim = nodejs-slim_22; corepack = hiPrio corepack_22; - nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; - nodejs-slim_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; - corepack_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; - nodejs_20 = callPackage ../development/web/nodejs/v20.nix { }; nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { enableNpm = false; }; corepack_20 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_20; });