Merge master into staging

5 files changed, 41 insertions, 81 deletions

diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index 14b9a78af46e..cc88b32119e7 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -4,15 +4,20 @@
 
 let hashes = {
   "8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r";
+  "8.1" = "0isi75j94q79x4341rhd94c60228iwvccy71ssnyvh1025m93xcd";
+};
+revs = {
+  "8.0" = "8.0";
+  "8.1" = "8.1";
 };
 in stdenv.mkDerivation rec {
   name = "acl2-${version}";
-  version = "8.0";
+  version = "8.1";
 
   src = fetchFromGitHub {
     owner = "acl2-devel";
     repo = "acl2-devel";
-    rev = "${version}";
+    rev = revs."${version}";
     sha256 = hashes."${version}";
   };
 
diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix
deleted file mode 100644
index be49d2dd9215..000000000000
--- a/pkgs/development/interpreters/lua-4/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "lua-4.0.1";
-
-  src = fetchurl {
-    url = https://www.lua.org/ftp/lua-4.0.1.tar.gz;
-    sha256 = "0ajd906hasii365xdihv9mdmi3cixq758blx0289x4znkha6wx6z";
-  };
-
-  configurePhase = "sed -i -e 's/CFLAGS= -O2/CFLAGS = -O3 -fPIC/' config";
-  buildFlags = "all so sobin";
-  installFlags = "INSTALL_ROOT=$$out";
-
-  hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
-
-  meta = {
-    homepage = http://www.lua.org;
-    description = "Powerful, fast, lightweight, embeddable scripting language";
-    longDescription = ''
-      Lua combines simple procedural syntax with powerful data
-      description constructs based on associative arrays and extensible
-      semantics. Lua is dynamically typed, runs by interpreting bytecode
-      for a register-based virtual machine, and has automatic memory
-      management with incremental garbage collection, making it ideal
-      for configuration, scripting, and rapid prototyping.
-    '';
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
-    branch = "4";
-  };
-}
diff --git a/pkgs/development/interpreters/lua-5/5.0.3.nix b/pkgs/development/interpreters/lua-5/5.0.3.nix
deleted file mode 100644
index d343ec6c63b1..000000000000
--- a/pkgs/development/interpreters/lua-5/5.0.3.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "lua-5.0.3";
-
-  src = fetchurl {
-    url = https://www.lua.org/ftp/lua-5.0.3.tar.gz;
-    sha256 = "1193a61b0e08acaa6eee0eecf29709179ee49c71baebc59b682a25c3b5a45671";
-  };
-
-  hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";
-
-  configurePhase = "sed -i -e 's/MYCFLAGS=.*/MYCFLAGS=-O3 -fomit-frame-pointer -fPIC/' config";
-  buildFlags = "all so sobin";
-  installFlags = "INSTALL_ROOT=$$out";
-  installTargets = "install soinstall";
-
-  meta = {
-    homepage = http://www.lua.org;
-    description = "Powerful, fast, lightweight, embeddable scripting language";
-    longDescription = ''
-      Lua combines simple procedural syntax with powerful data
-      description constructs based on associative arrays and extensible
-      semantics. Lua is dynamically typed, runs by interpreting bytecode
-      for a register-based virtual machine, and has automatic memory
-      management with incremental garbage collection, making it ideal
-      for configuration, scripting, and rapid prototyping.
-    '';
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index 6d8de7bae27e..a8badf647c0c 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -10,11 +10,11 @@ in
 stdenv.mkDerivation rec {
   name = "lua-${version}";
   luaversion = "5.2";
-  version = "${luaversion}.3";
+  version = "${luaversion}.4";
 
   src = fetchurl {
     url = "https://www.lua.org/ftp/${name}.tar.gz";
-    sha256 = "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk";
+    sha256 = "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr";
   };
 
   buildInputs = [ readline ];
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index adffe647c365..5af569a5e7c8 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -37,10 +37,7 @@ let
   , opensslSupport ? config.php.openssl or true
   , mbstringSupport ? config.php.mbstring or true
   , gdSupport ? config.php.gd or true
-  # Because of an upstream bug: https://bugs.php.net/bug.php?id=76826
-  # We need to disable the intl support on darwin. Whenever the upstream bug is
-  # fixed we should revert this to just just "config.php.intl or true".
-  , intlSupport ? (config.php.intl or true) && (!stdenv.isDarwin)
+  , intlSupport ? config.php.intl or true
   , exifSupport ? config.php.exif or true
   , xslSupport ? config.php.xsl or false
   , mcryptSupport ? config.php.mcrypt or true
@@ -225,13 +222,35 @@ let
     };
 
 in {
-  php71 = generic {
-    version = "7.1.22";
-    sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8";
-  };
-
-  php72 = generic {
-    version = "7.2.10";
-    sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1";
-  };
+  # Because of an upstream bug: https://bugs.php.net/bug.php?id=76826
+  # We can't update the darwin versions because they simply don't compile at
+  # all due to a bug in the intl extensions.
+  #
+  # The bug so far is present in 7.1.21, 7.1.22, 7.2.9, 7.2.10.
+
+  php71 = generic (
+    if stdenv.isDarwin then
+      {
+        version = "7.1.20";
+        sha256 = "0i8xd6p4zdg8fl6f0j430raanlshsshr3s3jlm72b0gvi1n4f6rs";
+      }
+    else
+      {
+        version = "7.1.22";
+        sha256 = "0qz74qdlk19cw478f42ckyw5r074y0fg73r2bzlhm0dar0cizsf8";
+      }
+  );
+
+  php72 = generic (
+    if stdenv.isDarwin then
+      {
+        version = "7.2.8";
+        sha256 = "1rky321gcvjm0npbfd4bznh36an0y14viqcvn4yzy3x643sni00z";
+      }
+    else
+      {
+        version = "7.2.10";
+        sha256 = "17fsvdi6ihjghjsz9kk2li2rwrknm2ccb6ys0xmn789116d15dh1";
+      }
+  );
 }