Merge branch 'master' into staging

pkgs/development/interpreters/lua-4/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = http://www.lua.org/ftp/lua-4.0.1.tar.gz;
-    md5 = "a31d963dbdf727f9b34eee1e0d29132c";
+    sha256 = "0ajd906hasii365xdihv9mdmi3cixq758blx0289x4znkha6wx6z";
   };
 
   configurePhase = "sed -i -e 's/CFLAGS= -O2/CFLAGS = -O3 -fPIC/' config";

pkgs/development/interpreters/php/default.nix

@@ -305,7 +305,7 @@ in {
   };
 
   php70 = generic {
-    version = "7.0.10";
-    sha256 = "1ppn17n5klhs1b2mcbbxxiqq4xvdbmv8p866q0qnk61nlzjvnmc0";
+    version = "7.0.11";
+    sha256 = "1wgpkfzpiap29nxjzqjjvpgirpg61n61xbqq9f25i60lq6fp56zr";
   };
 }

pkgs/development/interpreters/python/pypy/2.7/default.nix

@@ -6,7 +6,7 @@ assert zlibSupport -> zlib != null;
 
 let
 
-  majorVersion = "5.4.0";
+  majorVersion = "5.4.1";
   version = "${majorVersion}";
   libPrefix = "pypy${majorVersion}";
 
@@ -18,7 +18,7 @@ let
 
     src = fetchurl {
       url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";
-      sha256 = "1jm4ak6rbqhdhm8gjbd5hanabskbyzhzvjcl93fj0i017yirw88i";
+      sha256 = "1x8sa5x1nkrb8wrmicri94ji8kvyxihyryi8br5fk7gak0agcai0";
     };
 
    # http://bugs.python.org/issue27369
@@ -32,14 +32,6 @@ let
       patch lib-python/2.7/test/test_pyexpat.py < '${expatch}'
     '';
 
-    # Increase recursion limit. This patch is not needed on pypy > 5.4.0
-    patches = [
-      (fetchurl {
-        url = "https://bitbucket.org/pypy/pypy/commits/a5db0f4359abb3f64b6d7ed83202e1cb0de37fb2/raw/";
-        sha256 = "07nvqjhj0kl67f3kjwhmybaqg6089ps3q8r0si1lgk3gyb56ygn0";
-      })
-    ];
-
     buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ]
       ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc
       ++ stdenv.lib.optional zlibSupport zlib;

pkgs/development/interpreters/racket/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeFontsConf, makeWrapper
 , cairo, coreutils, fontconfig, freefont_ttf
-, glib, gmp, gtk, libffi, libjpeg, libpng
+, glib, gmp, gtk2, libffi, libjpeg, libpng
 , libtool, mpfr, openssl, pango, poppler
 , readline, sqlite
 , disableDocs ? true
@@ -17,7 +17,7 @@ let
     fontconfig
     glib
     gmp
-    gtk
+    gtk2
     libjpeg
     libpng
     mpfr