Merge pull request #187549 from marsam/update-nodejs

nodejs: 16.17.0 -> 18.7.0
This commit is contained in:
Mario Rodas 2022-08-20 10:40:10 -05:00 committed by GitHub
commit a877985f10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions

View file

@ -1,4 +1,4 @@
{ callPackage, python3, enableNpm ? true }:
{ callPackage, python3, fetchpatch, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix {
@ -11,5 +11,13 @@ buildNodejs {
sha256 = "sha256-iDSjPJLf5rqJA+ZxXK6qJd/0ZX5wPFTNBuwRNJPiw8I=";
patches = [
./disable-darwin-v8-system-instrumentation.patch
# Fix npm silently fail without a HOME directory https://github.com/npm/cli/issues/4996
(fetchpatch {
url = "https://github.com/npm/cli/commit/9905d0e24c162c3f6cc006fa86b4c9d0205a4c6f.patch";
sha256 = "sha256-RlabXWtjzTZ5OgrGf4pFkolonvTDIPlzPY1QcYDd28E=";
includes = [ "deps/npm/lib/npm.js" "deps/npm/lib/utils/log-file.js" ];
stripLen = 1;
extraPrefix = "deps/npm/";
})
];
}

View file

@ -8253,9 +8253,9 @@ with pkgs;
nodenv = callPackage ../development/tools/nodenv { };
nodejs = hiPrio nodejs-16_x;
nodejs = hiPrio nodejs-18_x;
nodejs-slim = nodejs-slim-16_x;
nodejs-slim = nodejs-slim-18_x;
nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { };
nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix {