Merge branch 'master' into closure-size

Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
This commit is contained in:
Vladimír Čunát
2016-04-10 11:17:52 +02:00
344 changed files with 58220 additions and 29215 deletions

View File

@@ -6,7 +6,7 @@
assert stdenv.system != "armv5tel-linux";
let
version = "5.9.0";
version = "5.10.1";
deps = {
inherit openssl zlib libuv;
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
sha256 = "0ghgfqs64794g6ggrvsdcqwz2lnhck0yiy2fyyg3in8z91k5l5z5";
sha256 = "1kdaahq3h89c7mz2qbqx43qdigsswl1i8ll5vw6j8g5m2av7iqn6";
};
configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];