Merge pull request #60130 from lo1tuma/nodejs-12_staging

nodejs-12_x: init at 12.0.0
This commit is contained in:
Will Dietz 2019-04-25 23:08:20 -05:00 committed by GitHub
commit 5340c05e04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 2 deletions

View file

@ -1,14 +1,14 @@
{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: { stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.27.0"; version = "1.28.0";
pname = "libuv"; pname = "libuv";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1nhd3772qymlv0b251wg9rrqz279vki4hnd4s23yyll0kpmzkpac"; sha256 = "0l0gx69sdy3sv3pirjbca2ws54n9d83mj0j96h77k0ncywimvi64";
}; };
postPatch = let postPatch = let

View file

@ -0,0 +1,10 @@
{ stdenv, callPackage, lib, openssl, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix { inherit openssl; };
in
buildNodejs {
inherit enableNpm;
version = "12.0.0";
sha256 = "0y7wrf7id3zawfgqcscbbxmll4h1ij7mwxms14wcywfswm88bi4k";
}

View file

@ -4079,6 +4079,13 @@ in
enableNpm = false; enableNpm = false;
openssl = openssl_1_1; openssl = openssl_1_1;
}; };
nodejs-12_x = callPackage ../development/web/nodejs/v12.nix {
openssl = openssl_1_1;
};
nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {
enableNpm = false;
openssl = openssl_1_1;
};
nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix { nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix {
nodejs = pkgs.nodejs-10_x; nodejs = pkgs.nodejs-10_x;