diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2018-12-29 22:05:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-29 22:05:11 +0100 |
commit | ebdfafdb6e8cd625c356a5cd8f71103e98ed5fec (patch) | |
tree | 9004ff11c7ec423f0da823dd5386e7d16f7d4a0b /pkgs/development | |
parent | ffbad0de5201f1b7bc9b1f3b9fb0dd969bdadbde (diff) | |
parent | e6a86e65d94ecbec0ec72901d542d1506101fa53 (diff) | |
download | nixlib-ebdfafdb6e8cd625c356a5cd8f71103e98ed5fec.tar nixlib-ebdfafdb6e8cd625c356a5cd8f71103e98ed5fec.tar.gz nixlib-ebdfafdb6e8cd625c356a5cd8f71103e98ed5fec.tar.bz2 nixlib-ebdfafdb6e8cd625c356a5cd8f71103e98ed5fec.tar.lz nixlib-ebdfafdb6e8cd625c356a5cd8f71103e98ed5fec.tar.xz nixlib-ebdfafdb6e8cd625c356a5cd8f71103e98ed5fec.tar.zst nixlib-ebdfafdb6e8cd625c356a5cd8f71103e98ed5fec.zip |
Merge pull request #48911 from holidaycheck/nodejs-11
nodejs: init at 11.5.0
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/web/nodejs/nodejs.nix | 10 | ||||
-rw-r--r-- | pkgs/development/web/nodejs/v11.nix | 10 |
2 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index a9c08e1c5b73..c0ba92ad4417 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -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 = { diff --git a/pkgs/development/web/nodejs/v11.nix b/pkgs/development/web/nodejs/v11.nix new file mode 100644 index 000000000000..b5ff17a67a10 --- /dev/null +++ b/pkgs/development/web/nodejs/v11.nix @@ -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"; + } |