cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #169988 from marsam/init-nodejs-18_x

Browse source 
nodejs-18_x: init at 18.0.0
This commit is contained in:
Mario Rodas 2022-04-24 05:38:42 -05:00 committed by GitHub
commit 3562bb5f33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/web/nodejs/nodejs.nix
View file

@ -136,7 +136,7 @@ let
${optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) '' ${optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) ''
mkdir -p $out/share/bash-completion/completions/ mkdir -p $out/share/bash-completion/completions/
$out/bin/npm completion > $out/share/bash-completion/completions/npm $out/bin/npm completion > $out/share/bash-completion/completions/npm || :
for dir in "$out/lib/node_modules/npm/man/"*; do for dir in "$out/lib/node_modules/npm/man/"*; do
mkdir -p $out/share/man/$(basename "$dir") mkdir -p $out/share/man/$(basename "$dir")
for page in "$dir"/*; do for page in "$dir"/*; do

15
pkgs/development/web/nodejs/v18.nix Normal file
View file

@ -0,0 +1,15 @@
{ callPackage, python3, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix {
python = python3;
};
in
buildNodejs {
inherit enableNpm;
version = "18.0.0";
sha256 = "sha256-NE0OZUC1JMaal5/1w+eM2nJU/XLANpmSa+sLhVi4znU=";
patches = [
./disable-darwin-v8-system-instrumentation.patch
];
}

9
pkgs/top-level/all-packages.nix
View file

@ -7757,10 +7757,13 @@ with pkgs;
nodejs-slim-17_x = callPackage ../development/web/nodejs/v17.nix { nodejs-slim-17_x = callPackage ../development/web/nodejs/v17.nix {
enableNpm = false; enableNpm = false;
}; };
nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { };
nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix {
enableNpm = false;
};
# Update this when adding the newest nodejs major version! # Update this when adding the newest nodejs major version!
# Do not set to nodejs-17_x because it requires 10.13 SDK on Darwin nodejs_latest = nodejs-18_x;
nodejs_latest = nodejs-16_x; nodejs-slim_latest = nodejs-slim-18_x;
nodejs-slim_latest = nodejs-slim-16_x;
nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs; nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs;