diff options
author | Raito Bezarius <masterancpp@gmail.com> | 2023-10-30 14:43:52 +0100 |
---|---|---|
committer | Raito Bezarius <masterancpp@gmail.com> | 2023-11-17 20:26:55 +0100 |
commit | b013b3ee50cace81104bc29b8fc4496a3093b5cd (patch) | |
tree | 50c1e3a54ae1c05e5e70207c771e070377a4d135 | |
parent | 2912f7ec10bcfd7082e0d4094f6c882237c511e4 (diff) | |
download | nixpkgs-b013b3ee50cace81104bc29b8fc4496a3093b5cd.tar nixpkgs-b013b3ee50cace81104bc29b8fc4496a3093b5cd.tar.gz nixpkgs-b013b3ee50cace81104bc29b8fc4496a3093b5cd.tar.bz2 nixpkgs-b013b3ee50cace81104bc29b8fc4496a3093b5cd.tar.lz nixpkgs-b013b3ee50cace81104bc29b8fc4496a3093b5cd.tar.xz nixpkgs-b013b3ee50cace81104bc29b8fc4496a3093b5cd.tar.zst nixpkgs-b013b3ee50cace81104bc29b8fc4496a3093b5cd.zip |
nodejs_16: drop
Security support EOLed 1 month ago.
-rw-r--r-- | pkgs/development/web/nodejs/v16.nix | 35 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 2 insertions, 38 deletions
diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix deleted file mode 100644 index 930b648ca55..00000000000 --- 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 b973af8da5f..f3db0c7c791 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 1ca223ba75f..a7716efbab3 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; }); |