Merge branch 'master' into closure-size

TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:47:26 +01:00
parent bbcf127c7c 468f698f60
commit f9f6f41bff
951 changed files with 117997 additions and 19014 deletions
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -309,8 +309,8 @@ in {
  };

  php70 = generic {
-    version = "7.0.0";
-    sha256 = "1spwxpfx0q95cfkwl1n8hpczgwy69x901v60ywwpl5ijd0q58am9";
+    version = "7.0.1";
+    sha256 = "0hiyv71ysbzcl3kf28phjyycp7myjd89l8f28arrf4q0vb8kpkh4";
  };

 }