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

@@ -304,8 +304,8 @@ in {
};
php70 = generic {
version = "7.0.2";
sha256 = "0di2vallv5kry85l67za25nq4f2hjr8fad5j0c06nb69v7xpa6wv";
version = "7.0.5";
sha256 = "1s8xnnxwq5big2rnbp3w7zw7wh5d5ra9p2q9bxwylds5wrzsy29c";
};
}