summary refs log tree commit diff
path: root/pkgs/servers/sql
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-07-17 06:37:13 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-07-17 06:38:04 +0200
commit9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c (patch)
tree946e5c7626f668079bcf35caf203a52c5d33f3c7 /pkgs/servers/sql
parentcf8309ef34b9ec18bc9aeca9e63f984e1be19b56 (diff)
parent967abfc78660d0e49a32eac8fe19cec4b6b79d5c (diff)
downloadnixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar
nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.gz
nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.bz2
nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.lz
nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.xz
nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.tar.zst
nixlib-9f37e91ec502b68e7a8ebc71b7bf37ad02092a0c.zip
Merge master into staging
There are larger-rebuild changes: gnutls and samba.
Diffstat (limited to 'pkgs/servers/sql')
-rw-r--r--pkgs/servers/sql/mariadb/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 1e962f5df90d..27383721cebb 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "mariadb-${version}";
-  version = "10.0.19";
+  version = "10.0.20";
 
   src = fetchurl {
     url    = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz";
-    sha256 = "0cm1j4805ypbmrhajn4ar5rqsis1p5haxs7c04b6k540gmfmxgrg";
+    sha256 = "0ywb730l68mxvmpik1x2ndbdaaks6dmc17pxspspm5wlqxinjkrs";
   };
 
   buildInputs = [ cmake ncurses openssl zlib pcre libxml2 boost judy bison libevent ]