Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/development/interpreters/angelscript/default.nix

@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="angelscript";
-    version = "2.31.0";
+    version = "2.31.1";
     name="${baseName}-${version}";
     url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    sha256 = "03a0gmz95di62552dv873iwwy1ym96kpyrc0s708assjlslr9716";
+    sha256 = "00z0x2w1dnfd2h8xvmq3qy2n8gqxyi9gxwnsz0q420by8vnrljmh";
   };
   buildInputs = [
     unzip

pkgs/development/interpreters/guile/default.nix

@@ -7,11 +7,11 @@
  else stdenv.mkDerivation)
 
 (rec {
-  name = "guile-2.0.11";
+  name = "guile-2.0.12";
 
   src = fetchurl {
     url = "mirror://gnu/guile/${name}.tar.xz";
-    sha256 = "1qh3j7308qvsjgwf7h94yqgckpbgz2k3yqdkzsyhqcafvfka9l5f";
+    sha256 = "1sdpjq0jf1h65w29q0zprj4x6kdp5jskkvbnlwphy9lvdxrqg0fy";
   };
 
   nativeBuildInputs = [ makeWrapper gawk pkgconfig ];

pkgs/development/interpreters/lolcode/default.nix

@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, doxygen, cmake }:
+{ stdenv, fetchurl, pkgconfig, doxygen, cmake, readline }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "lolcode-${version}";
-  version = "0.10.5";
+  version = "0.11.2";
 
   src = fetchurl {
     url = "https://github.com/justinmeza/lci/archive/v${version}.tar.gz";
-    sha256 = "0g6k1jxnvgjxyidrvgk8pdb8y8mai456j9zpzmvhm6fr22c4skrc";
+    sha256 = "1li7ikcrs7wqah7gqkirg0k61n6pm12w7pydin966x1sdn9na46b";
   };
 
-  buildInputs = [ pkgconfig doxygen cmake ];
+  nativeBuildInputs = [ pkgconfig cmake doxygen ];
+  buildInputs = [ readline ];
 
   # Maybe it clashes with lci scientific logic software package...
   postInstall = "mv $out/bin/lci $out/bin/lolcode-lci";

pkgs/development/interpreters/php/default.nix

@@ -107,7 +107,7 @@ let
         };
 
         mysql = {
-          configureFlags = ["--with-mysql=${mysql.lib}"];
+          configureFlags = ["--with-mysql"];
           buildInputs = [ mysql.lib ];
         };