Unverified Commit 3562bb5f authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

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

nodejs-18_x: init at 18.0.0
parents 81e716da 943c2eb1

pkgs/development/web/nodejs/nodejs.nix

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ let 


      ${optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) ''

        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

          mkdir -p $out/share/man/$(basename "$dir")

          for page in "$dir"/*; do

pkgs/development/web/nodejs/v18.nix

0 → 100644
+15 −0
Original line number Diff line number Diff line 
{ 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

  ];

}

pkgs/top-level/all-packages.nix

+6 −3
Original line number Diff line number Diff line
@@ -7757,10 +7757,13 @@ with pkgs; 
  nodejs-slim-17_x = callPackage ../development/web/nodejs/v17.nix {

    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!

  # Do not set to nodejs-17_x because it requires 10.13 SDK on Darwin

  nodejs_latest = nodejs-16_x;

  nodejs-slim_latest = nodejs-slim-16_x;

  nodejs_latest = nodejs-18_x;

  nodejs-slim_latest = nodejs-slim-18_x;















  nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs;