public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #79350 from Izorkin/mariadb

Browse Source 
mariadb: 10.3.20 -> 10.3.22
This commit is contained in:
Jörg Thalheim 2020-02-22 22:18:07 +00:00 committed by GitHub
commit ac9211f67b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/servers/sql/mariadb/default.nix
View File

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