Merge pull request #209766 from anthonyroussel/nodejs

nodejs: 14.21.1 -> 14.21.2, 16.18.1 -> 16.19.0, 18.12.1 -> 18.13.0, 19.2.0 -> 19.4.0
This commit is contained in:
Mario Rodas 2023-01-13 20:05:56 -05:00 committed by GitHub
commit 374d7413a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 19 deletions

View File

@ -8,7 +8,7 @@ let
in
buildNodejs {
inherit enableNpm;
version = "14.21.1";
sha256 = "sha256-PbldbKcolXvwkLYwGnqdLYBxSyoG2Jih22XG5Csdp6w=";
version = "14.21.2";
sha256 = "00zzl43iis8mr8x48hww5ncj8mj5dmpn05rq7ihpffkp2q7rmw6q";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}

View File

@ -10,8 +10,8 @@ let
in
buildNodejs {
inherit enableNpm;
version = "16.18.1";
sha256 = "sha256-H4BRqI+G9CBk9EFf56mA5ZsKUC7Mje9YP2MDvE1EUjg=";
version = "16.19.0";
sha256 = "01k72p0hp4lhlpz1syd9cbkm2gpfww0hn10xdpmzd4i3x8dfq7sg";
patches = [
./disable-darwin-v8-system-instrumentation.patch
./bypass-darwin-xcrun-node16.patch

View File

@ -1,4 +1,4 @@
{ callPackage, openssl, fetchpatch, python3, enableNpm ? true }:
{ callPackage, openssl, python3, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix {
@ -10,17 +10,9 @@ let
in
buildNodejs {
inherit enableNpm;
version = "18.12.1";
sha256 = "sha256-T6QGRRvFJlmikOUs/bIWKnYL1UnaS4u+vmop8pbZON8=";
version = "18.13.0";
sha256 = "0s6sscynhw9limpp43f965rn9grdamcvsnd9wfb2h5qxw1icajpx";
patches = [
(fetchpatch {
# Fixes cross compilation to aarch64-linux by reverting https://github.com/nodejs/node/pull/43200
name = "revert-arm64-pointer-auth.patch";
url = "https://github.com/nodejs/node/pull/43200/commits/d42c42cc8ac652ab387aa93205aed6ece8a5040a.patch";
sha256 = "sha256-ipGzg4lEoftTJbt6sW+0QJO/AZqHvUkFKe0qlum+iLY=";
revert = true;
})
./disable-darwin-v8-system-instrumentation.patch
./bypass-darwin-xcrun-node16.patch
] ++ npmPatches;

View File

@ -6,15 +6,14 @@ let
python = python3;
};
npmPatches = callPackage ./npm-patches.nix { };
in
buildNodejs {
inherit enableNpm;
version = "19.2.0";
sha256 = "sha256-CVaw/wHy9jg4J+kWpgSBWc4r2wUhf2VKj/9U6BFtwX4=";
version = "19.4.0";
sha256 = "0qdj67dgxbjpllm2z9vm46c50s3dqk8a34hbp81vsa7mf3b42182";
patches = [
./revert-arm64-pointer-auth.patch
./disable-darwin-v8-system-instrumentation-node19.patch
./bypass-darwin-xcrun-node16.patch
] ++ npmPatches;
];
}