Merge branch 'staging'

2016-08-10 22:09:38 +02:00
parent f191b65820 6f5c6fb6a1
commit 947abb08ac
30 changed files with 180 additions and 174 deletions
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/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 ];
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -107,7 +107,7 @@ let
        };

        mysql = {
-          configureFlags = ["--with-mysql=${mysql.lib}"];
+          configureFlags = ["--with-mysql"];
          buildInputs = [ mysql.lib ];
        };