From 2674894432ab1c175c19a8de2d8f993d01615ae5 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 4 Jul 2022 03:04:58 +0200 Subject: [PATCH] nodejs-12_x: remove --- pkgs/development/web/nodejs/v12.nix | 14 -------------- pkgs/top-level/aliases.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 pkgs/development/web/nodejs/v12.nix diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix deleted file mode 100644 index ea7c211163e2..000000000000 --- a/pkgs/development/web/nodejs/v12.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ callPackage, icu68, python2, lib, stdenv, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { - icu = icu68; - python = python2; - }; -in - buildNodejs { - inherit enableNpm; - version = "12.22.12"; - sha256 = "1whl0zi6fs9ay33bhcn2kh9xynran05iipahg1zzr6sv97wbfhmw"; - patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d35274555110..db1bc330c2c2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -953,7 +953,8 @@ mapAliases ({ nmap-unfree = nmap; # Added 2021-04-06 nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 - nodejs-10_x = throw "nodejs-10_X has been removed. Use a newer version instead."; # Added 2022-05-31 + nodejs-10_x = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31 + nodejs-12_x = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43b9788e9b37..d09cc984ac3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8077,10 +8077,6 @@ with pkgs; nodejs-slim = nodejs-slim-16_x; - nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { }; - nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { - enableNpm = false; - }; nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { }; nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { enableNpm = false;