Merge branch 'master' into staging

2015-05-08 05:59:50 -07:00
parent aa5791f7ad 3a07187003
commit c9395e1e92
42 changed files with 1037 additions and 528 deletions
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
  name = "mariadb-${version}";
-  version = "10.0.17";
+  version = "10.0.18";

  src = fetchurl {
    url    = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz";
-    sha256 = "04ckq67qgkghh7yzrbzwidk7wn7yjml15gzj2c5p1hs2k7lr9lww";
+    sha256 = "1xcs391cm0vnl9bvx1470v8z4d77zqv16n6iaqi12jm0ma8fwvv8";
  };

  buildInputs = [ cmake ncurses openssl zlib pcre libxml2 boost judy bison libevent ]