Merge pull request #232382 from marsam/update-nodejs

nodejs_20: 20.1.0 -> 20.2.0, nodejs_19: drop
This commit is contained in:
Mario Rodas 2023-05-17 14:20:16 -05:00 committed by GitHub
commit 5deeadb248
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 27 deletions

View file

@ -1,19 +0,0 @@
{ callPackage, openssl, fetchpatch, python3, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix {
inherit openssl;
python = python3;
};
in
buildNodejs {
inherit enableNpm;
version = "19.9.0";
sha256 = "sha256-x/zp1Gymzg2JkEM8v2AbuSecDq7YcFs1cBjPUL6b7Sk=";
patches = [
./revert-arm64-pointer-auth.patch
./disable-darwin-v8-system-instrumentation-node19.patch
./bypass-darwin-xcrun-node16.patch
];
}

View file

@ -9,8 +9,8 @@ let
in in
buildNodejs { buildNodejs {
inherit enableNpm; inherit enableNpm;
version = "20.1.0"; version = "20.2.0";
sha256 = "sha256-YA+eEYYJlYFLkSKxrFMY9q1WQnR4Te7ZjYqSBmSUNrU="; sha256 = "sha256-IlI98jFsNVaXFP8fabBTwuKGztRgiYQX3uRpRe/N+Yk=";
patches = [ patches = [
./revert-arm64-pointer-auth.patch ./revert-arm64-pointer-auth.patch
./disable-darwin-v8-system-instrumentation-node19.patch ./disable-darwin-v8-system-instrumentation-node19.patch

View file

@ -1145,8 +1145,6 @@ mapAliases ({
nodejs-slim-16_x = nodejs-slim_16; # 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-18_x = nodejs_18; # Added 2022-11-06
nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06
nodejs-19_x = nodejs_19; # Added 2022-11-06
nodejs-slim-19_x = nodejs-slim_19; # Added 2022-11-06
nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 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 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 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27

View file

@ -9488,10 +9488,6 @@ with pkgs;
nodejs-slim_18 = callPackage ../development/web/nodejs/v18.nix { nodejs-slim_18 = callPackage ../development/web/nodejs/v18.nix {
enableNpm = false; enableNpm = false;
}; };
nodejs_19 = callPackage ../development/web/nodejs/v19.nix { };
nodejs-slim_19 = callPackage ../development/web/nodejs/v19.nix {
enableNpm = false;
};
nodejs_20 = callPackage ../development/web/nodejs/v20.nix { }; nodejs_20 = callPackage ../development/web/nodejs/v20.nix { };
nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix {
enableNpm = false; enableNpm = false;