@@ -2,8 +2,7 @@
22, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl
33, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
44, fixDarwinDylibNames, cctools, CoreServices
5−, asio, buildEnv, check, scons
6−, less, fetchpatch
5+, asio, buildEnv, check, scons, less
76, withoutClient ? false
87}:
98
@@ -21,14 +20,14 @@ mariadb = server // {
2120};
2221
2322common = rec { # attributes common to both builds
24− version = "10.3.18";
23+ version = "10.3.20";
2524
2625 src = fetchurl {
2726 urls = [
2827 "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"
2928 "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
3029 ];
31− sha256 = "1p6yvmahnkmsz50zjzp20ak7jzbqysly5bdl51nnrngrbfl6qib9";
30+ sha256 = "14n4zfpwhvafz02r95bidmkwq2bz9jj3safqni1h21jfd0nqz0ak";
3231 name = "mariadb-${version}.tar.gz";
3332 };
3433
@@ -46,12 +45,7 @@ common = rec { # attributes common to both builds
4645 patches = [
4746 ./cmake-includedir.patch
4847 ./cmake-libmariadb-includedir.patch
49− ] ++ optional stdenv.hostPlatform.isDarwin (fetchpatch {
50− url = "https://github.com/MariaDB/mariadb-connector-c/commit/ee91b2c98a63acb787114dee4f2694e154630928.patch";
51− extraPrefix = "libmariadb/";
52− sha256 = "06i865zwyhs9fvrgmargzn09pbg1cmably3c4wifd241bj8ig8qk";
53− stripLen = 1;
54− });
48+ ];
5549
5650 cmakeFlags = [
5751 "-DBUILD_CONFIG=mysql_release"