Merge pull request #48911 from holidaycheck/nodejs-11

nodejs: init at 11.5.0
This commit is contained in:
Silvan Mosberger 2018-12-29 22:05:11 +01:00 committed by GitHub
commit ebdfafdb6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 3 deletions

View File

@ -12,12 +12,16 @@ with stdenv.lib;
{ enableNpm ? true, version, sha256, patches ? [] } @args:
let
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
majorVersion = versions.major version;
minorVersion = versions.minor version;
baseName = if enableNpm then "nodejs" else "nodejs-slim";
sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs (!stdenv.isDarwin) { inherit http-parser; });
useSharedHttpParser = !stdenv.isDarwin && versionOlder "${majorVersion}.${minorVersion}" "11.4";
sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs useSharedHttpParser { inherit http-parser; });
sharedConfigureFlags = concatMap (name: [
"--shared-${name}"
@ -103,7 +107,7 @@ in
passthru.updateScript = import ./update.nix {
inherit stdenv writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix;
inherit (stdenv) lib;
majorVersion = with stdenv.lib; elemAt (splitString "." version) 0;
inherit majorVersion;
};
meta = {

View File

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

View File

@ -3888,6 +3888,13 @@ in
enableNpm = false;
openssl = openssl_1_1;
};
nodejs-11_x = callPackage ../development/web/nodejs/v11.nix {
openssl = openssl_1_1;
};
nodejs-slim-11_x = callPackage ../development/web/nodejs/v11.nix {
enableNpm = false;
openssl = openssl_1_1;
};
nodePackages_10_x = callPackage ../development/node-packages/default-v10.nix {
nodejs = pkgs.nodejs-10_x;