Merge pull request #39564 from holidaycheck/nodejs-10

nodejs: init at v10.0.0
This commit is contained in:
adisbladis 2018-04-27 12:46:45 +08:00 committed by GitHub
commit e9841a62ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 2 deletions

View File

@ -2,14 +2,14 @@
, ApplicationServices, CoreServices }:
stdenv.mkDerivation rec {
version = "1.20.0";
version = "1.20.2";
name = "libuv-${version}";
src = fetchFromGitHub {
owner = "libuv";
repo = "libuv";
rev = "v${version}";
sha256 = "0bjxny5bjl0qy978i9n2b96vd72h9dd7ghylvhfsi1aqfwc0s1qz";
sha256 = "14zlf59fr03v684ryapc57r9nfrznyk5xvcd59q04rb435ibib48";
};
postPatch = let

View File

@ -0,0 +1,11 @@
{ stdenv, callPackage, lib, openssl, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix { inherit openssl; };
in
buildNodejs {
inherit enableNpm;
version = "10.0.0";
sha256 = "0l5bx2j4f2ij19kx14my7g7k37j3fn9qpjvbisjvhpbm42810fg2";
patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
}

View File

@ -3390,6 +3390,14 @@ with pkgs;
nodejs-9_x = callPackage ../development/web/nodejs/v9.nix {};
nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix { enableNpm = false; };
nodejs-10_x = callPackage ../development/web/nodejs/v10.nix {
openssl = openssl_1_1_0;
};
nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix {
enableNpm = false;
openssl = openssl_1_1_0;
};
nodePackages_8_x = callPackage ../development/node-packages/default-v8.nix {
nodejs = pkgs.nodejs-8_x;
};