2 files changed, 22 insertions, 23 deletions
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index a754e2c4347b..3f8554a298e4 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -1,18 +1,17 @@
-{ stdenv, fetchurl, hostPlatform }:
+{ stdenv, lib, fetchurl, hostPlatform }:
 rec {
 
-  luajit =
-    # Compatibility problems with lightuserdata pointers; see:
-    # https://github.com/LuaJIT/LuaJIT/blob/v2.1/doc/status.html#L101
-    if hostPlatform.is64bit && (/*hostPlatform.isArm ||*/ hostPlatform.isSunOS)
-        # FIXME: fix the aarch64 build
-      then luajit_2_0
-      else luajit_2_1;
+  luajit = luajit_2_1;
 
   luajit_2_0 = generic {
     version = "2.0.5";
     isStable = true;
     sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
+  } // {
+    # 64-bit ARM isn't supported upstream
+    meta = meta // {
+      platforms = lib.filter (p: p != "aarch64-linux") meta.platforms;
+    };
   };
 
   luajit_2_1 = generic {
@@ -22,6 +21,14 @@ rec {
   };
 
 
+  meta = with stdenv.lib; {
+    description = "High-performance JIT compiler for Lua 5.1";
+    homepage    = http://luajit.org;
+    license     = licenses.mit;
+    platforms   = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers ; [ thoughtpolice smironov vcunat ];
+  };
+
   generic =
     { version, sha256 ? null, isStable
     , name ? "luajit-${version}"
@@ -33,7 +40,7 @@ rec {
     }:
 
     stdenv.mkDerivation rec {
-      inherit name version src;
+      inherit name version src meta;
 
       luaversion = "5.1";
 
@@ -61,13 +68,5 @@ rec {
           ''
             ln -s "$out"/bin/luajit-* "$out"/bin/luajit
           '';
-
-      meta = with stdenv.lib; {
-        description = "High-performance JIT compiler for Lua 5.1";
-        homepage    = http://luajit.org;
-        license     = licenses.mit;
-        platforms   = platforms.linux ++ platforms.darwin;
-        maintainers = with maintainers ; [ thoughtpolice smironov vcunat ];
-      };
     };
 }
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 709f0fad41e6..675616a5f21e 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -325,17 +325,17 @@ let
 
 in {
   php56 = generic {
-    version = "5.6.30";
-    sha256 = "01krq8r9xglq59x376zlg261yikckq179jmhnlcg3gqxza9w41d1";
+    version = "5.6.31";
+    sha256 = "03xixkvfp64bqp97p8vlj3hp63bpjw7hc16b7fgm7w35rdlp2fcg";
   };
 
   php70 = generic {
-    version = "7.0.19";
-    sha256 = "0nbxgx5fkj1bcach97a3169kwic7jbd4b435n7v25v1aq2pw0fhg";
+    version = "7.0.21";
+    sha256 = "07r3qqyyvf16k4xk5b2070fwilggmph5937drjm8cvyyjb1k789b";
   };
 
   php71 = generic {
-    version = "7.1.5";
-    sha256 = "15w60nrickdi0rlsy5yw6aa1j42m6z2chv90f7fbgn0v9xwa9si8";
+    version = "7.1.7";
+    sha256 = "1y0z5n0kyd15wzmn1lprjgaysbg0z428q9cjbx4dqf3zk296g6q7";
   };
 }