Merge pull request #79350 from Izorkin/mariadb
mariadb: 10.3.20 -> 10.3.22
This commit is contained in:
commit
ac9211f67b
@ -1,7 +1,9 @@
|
||||
{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
|
||||
, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl
|
||||
, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
|
||||
, libaio, libevent, jemalloc, cracklib, systemd, perl
|
||||
, fixDarwinDylibNames, cctools, CoreServices, less
|
||||
, numactl # NUMA Support
|
||||
, withStorageMroonga ? true, kytea, msgpack, zeromq
|
||||
, withoutClient ? false
|
||||
}:
|
||||
|
||||
@ -19,14 +21,14 @@ mariadb = server // {
|
||||
};
|
||||
|
||||
common = rec { # attributes common to both builds
|
||||
version = "10.3.20";
|
||||
version = "10.3.22";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"
|
||||
"https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "14n4zfpwhvafz02r95bidmkwq2bz9jj3safqni1h21jfd0nqz0ak";
|
||||
sha256 = "1iyf1hl82nqsci5h327a537rvdrc5qcbrd1v3fc4cxy2pmfha01j";
|
||||
name = "mariadb-${version}.tar.gz";
|
||||
};
|
||||
|
||||
@ -144,6 +146,7 @@ server = stdenv.mkDerivation (common // {
|
||||
xz lzo lz4 bzip2 snappy
|
||||
libxml2 boost judy libevent cracklib
|
||||
] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl
|
||||
++ optionals withStorageMroonga [ kytea msgpack zeromq ]
|
||||
++ optional stdenv.hostPlatform.isLinux linux-pam
|
||||
++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv;
|
||||
|
||||
@ -164,6 +167,10 @@ server = stdenv.mkDerivation (common // {
|
||||
"-DWITH_INNODB_DISALLOW_WRITES=ON"
|
||||
"-DWITHOUT_EXAMPLE=1"
|
||||
"-DWITHOUT_FEDERATED=1"
|
||||
] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [
|
||||
"-DWITH_NUMA=ON"
|
||||
] ++ optional (!withStorageMroonga) [
|
||||
"-DWITHOUT_MROONGA=ON"
|
||||
] ++ optionals withoutClient [
|
||||
"-DWITHOUT_CLIENT=ON"
|
||||
] ++ optionals stdenv.hostPlatform.isDarwin [
|
||||
@ -179,7 +186,6 @@ server = stdenv.mkDerivation (common // {
|
||||
chmod +x "$out"/bin/wsrep_sst_common
|
||||
rm "$out"/bin/{mysql_client_test,mysqltest}
|
||||
rm -r "$out"/data # Don't need testing data
|
||||
mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
|
||||
'' + optionalString withoutClient ''
|
||||
${ # We don't build with GSSAPI on Darwin
|
||||
optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
@ -188,6 +194,8 @@ server = stdenv.mkDerivation (common // {
|
||||
}
|
||||
rm "$out"/lib/mysql/plugin/client_ed25519.so
|
||||
rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}}
|
||||
'' + optionalString withStorageMroonga ''
|
||||
mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
|
||||
'' + optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user