about summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2017-08-28 22:01:50 +0200
committerRobin Gloster <mail@glob.in>2017-12-29 02:18:35 +0100
commit3fcf6bf518d3594acad9e8e364acbcf8bddde6ea (patch)
treec5caad638ae64bbd4242361dd1b89665880a16a1 /pkgs/servers
parent3e241efe9bce5201acd26e3fbc5ade59199567b5 (diff)
downloadnixlib-3fcf6bf518d3594acad9e8e364acbcf8bddde6ea.tar
nixlib-3fcf6bf518d3594acad9e8e364acbcf8bddde6ea.tar.gz
nixlib-3fcf6bf518d3594acad9e8e364acbcf8bddde6ea.tar.bz2
nixlib-3fcf6bf518d3594acad9e8e364acbcf8bddde6ea.tar.lz
nixlib-3fcf6bf518d3594acad9e8e364acbcf8bddde6ea.tar.xz
nixlib-3fcf6bf518d3594acad9e8e364acbcf8bddde6ea.tar.zst
nixlib-3fcf6bf518d3594acad9e8e364acbcf8bddde6ea.zip
mariadb: 10.2.7 -> 10.2.8
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/sql/mariadb/default.nix12
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index b86463763587..5ddbeea913a9 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -15,11 +15,11 @@ mariadb = everything // {
 };
 
 common = rec { # attributes common to both builds
-  version = "10.2.7";
+  version = "10.2.8";
 
   src = fetchurl {
     url    = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve";
-    sha256 = "1g60fskf8w633icjjjj08a7h4ha6vaczyczlm4was9c3qjxs2nr2";
+    sha256 = "14r397rbk00647nkmbjzfcgicamgnyyqyi5ca9py51ghg7z51lld";
     name   = "mariadb-${version}.tar.gz";
   };
 
@@ -29,20 +29,12 @@ common = rec { # attributes common to both builds
   ] ++ stdenv.lib.optionals stdenv.isLinux [ libaio systemd ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ];
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/MariaDB/server/commit/7fc75c420a47fd29a399468b920641ebb43fa75c.patch";
-      sha256 = "0rgppcycw4gjkayz8fn4412dkplghpfzs3bq8ib1jqb9xzi3zvww";
-    })
-  ];
-
   prePatch = ''
     substituteInPlace cmake/libutils.cmake \
       --replace /usr/bin/libtool libtool
     sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
   '';
 
-
   cmakeFlags = [
     "-DBUILD_CONFIG=mysql_release"
     "-DMANUFACTURER=NixOS.org"