diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-09-19 15:04:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-19 15:04:21 -0500 |
| commit | 353a9ce669ca0b13c02781567509efed6fd4b48f (patch) | |
| tree | dfe0e2191ef7daaf388bc3ee0d3923cfa3d490c3 | |
| parent | e26a9c8bb7b46f0c66e272a5911af749f9e529a2 (diff) | |
| parent | 15caf7f787dc4d472ba36f1619bee7d9e3ff01ae (diff) | |
| download | nixpkgs-353a9ce669ca0b13c02781567509efed6fd4b48f.tar nixpkgs-353a9ce669ca0b13c02781567509efed6fd4b48f.tar.gz nixpkgs-353a9ce669ca0b13c02781567509efed6fd4b48f.tar.bz2 nixpkgs-353a9ce669ca0b13c02781567509efed6fd4b48f.tar.lz nixpkgs-353a9ce669ca0b13c02781567509efed6fd4b48f.tar.xz nixpkgs-353a9ce669ca0b13c02781567509efed6fd4b48f.tar.zst nixpkgs-353a9ce669ca0b13c02781567509efed6fd4b48f.zip | |
Merge pull request #256139 from marsam/update-nodejs
nodejs: 18.17.1 -> 18.18.0, 20.6.1 -> 20.7.0
| -rw-r--r-- | pkgs/development/web/nodejs/v18.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/web/nodejs/v20.nix | 4 |
2 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 0eb1ab4ce3f..13a50dc12db 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -8,20 +8,13 @@ let in buildNodejs { inherit enableNpm; - version = "18.17.1"; - sha256 = "sha256-8hXPA9DwDwesC2dMaBn4BMFULhbxUtoEmAAirsz15lo="; + version = "18.18.0"; + sha256 = "sha256-5NTbrDY02Z+JLwDbR9p4+YSTwzlYLoqV+y3Vn1z+D5A="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch ./revert-arm64-pointer-auth.patch ./node-npm-build-npm-package-logic.patch ./trap-handler-backport.patch - # Fixes target toolchain arguments being passed to the host toolchain when - # cross-compiling. For example, -m64 is not available on aarch64. - (fetchpatch { - name = "common-gypi-cross.patch"; - url = "https://github.com/nodejs/node/pull/48597.patch"; - hash = "sha256-FmHmwlTxPw5mTW6t4zuy9vr4FxopjU4Kx+F1aqabG1s="; - }) ]; } diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 7c4b390cc66..749358f5e46 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.6.1"; - sha256 = "sha256-Ouxeco2qOIAMNDsSkiHTSIBkolKaObtUZ7xVviJsais="; + version = "20.7.0"; + sha256 = "sha256-P8/c0FxGFRdIBZZZZnTfhbNc/OWX3QrjP1QW/E3xK+o="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch |