From 2912f7ec10bcfd7082e0d4094f6c882237c511e4 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 30 Oct 2023 14:43:25 +0100 Subject: nodejs_14: drop Security support EOLed 6 months ago. --- pkgs/development/web/nodejs/v14.nix | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 pkgs/development/web/nodejs/v14.nix (limited to 'pkgs/development/web') diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix deleted file mode 100644 index c2d5d58bea78..000000000000 --- a/pkgs/development/web/nodejs/v14.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ callPackage, lib, overrideCC, pkgs, buildPackages, openssl, python3, enableNpm ? true }: - -let - # Clang 16+ cannot build Node v14 due to -Wenum-constexpr-conversion errors. - # Use an older version of clang with the current libc++ for compatibility (e.g., with icu). - ensureCompatibleCC = packages: - if packages.stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion packages.stdenv.cc.cc) "16" - then overrideCC packages.llvmPackages_15.stdenv (packages.llvmPackages_15.stdenv.cc.override { - inherit (packages.llvmPackages) libcxx; - extraPackages = [ packages.llvmPackages.libcxxabi ]; - }) - else packages.stdenv; - - buildNodejs = callPackage ./nodejs.nix { - inherit openssl; - stdenv = ensureCompatibleCC pkgs; - buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; }; - python = python3; - }; -in - buildNodejs { - inherit enableNpm; - version = "14.21.3"; - sha256 = "sha256-RY7AkuYK1wDdzwectj1DXBXaTHuz0/mbmo5YqZ5UB14="; - patches = lib.optional pkgs.stdenv.isDarwin ./bypass-xcodebuild.diff; - } -- cgit 1.4.1 From b013b3ee50cace81104bc29b8fc4496a3093b5cd Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 30 Oct 2023 14:43:52 +0100 Subject: nodejs_16: drop Security support EOLed 1 month ago. --- pkgs/development/web/nodejs/v16.nix | 35 ----------------------------------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 pkgs/development/web/nodejs/v16.nix (limited to 'pkgs/development/web') diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix deleted file mode 100644 index 930b648ca559..000000000000 --- a/pkgs/development/web/nodejs/v16.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ callPackage, lib, overrideCC, pkgs, buildPackages, openssl, python3, fetchpatch, enableNpm ? true }: - -let - # Clang 16+ cannot build Node v14 due to -Wenum-constexpr-conversion errors. - # Use an older version of clang with the current libc++ for compatibility (e.g., with icu). - ensureCompatibleCC = packages: - if packages.stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion packages.stdenv.cc.cc) "16" - then overrideCC packages.llvmPackages_15.stdenv (packages.llvmPackages_15.stdenv.cc.override { - inherit (packages.llvmPackages) libcxx; - extraPackages = [ packages.llvmPackages.libcxxabi ]; - }) - else packages.stdenv; - - buildNodejs = callPackage ./nodejs.nix { - inherit openssl; - stdenv = ensureCompatibleCC pkgs; - buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; }; - python = python3; - }; - - npmPatches = callPackage ./npm-patches.nix { }; -in - buildNodejs { - inherit enableNpm; - # If you do upgrade here, please update in pkgs/top-level/release.nix - # the permitted insecure version to ensure it gets cached for our users - # and backport this to stable release (23.05). - version = "16.20.2"; - sha256 = "sha256-V28aA8RV5JGo0TK1h+trO4RlH8iXS7NjhDPdRNIsj0k="; - patches = [ - ./disable-darwin-v8-system-instrumentation.patch - ./bypass-darwin-xcrun-node16.patch - ./node-npm-build-npm-package-logic-node16.patch - ] ++ npmPatches; - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b973af8da5fd..f3db0c7c7913 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -627,8 +627,10 @@ mapAliases ({ nodejs-slim_14 = throw "nodejs-slim_14 has been removed as it is EOL."; # Added 2023-10-30 nodejs-14_x = nodejs_14; # Added 2022-11-06 nodejs-slim-14_x = nodejs-slim_14; # Added 2022-11-06 + nodejs_16 = throw "nodejs_16 has been removed as it is EOL."; # Added 2023-10-30 nodejs-16_x = nodejs_16; # Added 2022-11-06 nodejs-16_x-openssl_1_1 = throw "nodejs-16_x-openssl_1_1 has been removed."; # Added 2023-02-04 + nodejs-slim_16 = throw "nodejs-slim_16 has been removed as it is EOL."; # Added 2022-11-06 nodejs-slim-16_x = nodejs-slim_16; # Added 2022-11-06 nodejs-18_x = nodejs_18; # Added 2022-11-06 nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ca223ba75f0..a7716efbab3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10309,9 +10309,6 @@ with pkgs; nodejs-slim = nodejs-slim_18; corepack = hiPrio corepack_18; - nodejs_16 = callPackage ../development/web/nodejs/v16.nix { }; - nodejs-slim_16 = callPackage ../development/web/nodejs/v16.nix { enableNpm = false; }; - nodejs_18 = callPackage ../development/web/nodejs/v18.nix { }; nodejs-slim_18 = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; }; corepack_18 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_18; }); -- cgit 1.4.1 From ad11438d0913939b07ac95e6871d76b3e83ff713 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 30 Oct 2023 14:58:57 +0100 Subject: treewide: cleanup references to nodejs_14 Those packages didn't use Node.js 14 in practice, but Node.js 18 or more. --- pkgs/development/compilers/elm/packages/node-composition.nix | 2 +- pkgs/development/web/playwright-test/default.nix | 2 +- pkgs/servers/mx-puppet-discord/node-composition.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/web') diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index b6110ac4db99..c825c6c66349 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: let nodeEnv = import ../../../node-packages/node-env.nix { diff --git a/pkgs/development/web/playwright-test/default.nix b/pkgs/development/web/playwright-test/default.nix index b795f708f189..d9c0daef7834 100644 --- a/pkgs/development/web/playwright-test/default.nix +++ b/pkgs/development/web/playwright-test/default.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/servers/mx-puppet-discord/node-composition.nix b/pkgs/servers/mx-puppet-discord/node-composition.nix index 2042629fe9f5..bd96f550554b 100644 --- a/pkgs/servers/mx-puppet-discord/node-composition.nix +++ b/pkgs/servers/mx-puppet-discord/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import ../../.. { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: let nodeEnv = import ../../development/node-packages/node-env.nix { -- cgit 1.4.1