diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/sql/mariadb/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/servers/sql/mariadb/default.nix | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/default.nix index cbfae1d5e6e5..e70d43a1505e 100644 --- a/nixpkgs/pkgs/servers/sql/mariadb/default.nix +++ b/nixpkgs/pkgs/servers/sql/mariadb/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests -, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl -, libaio, libevent, jemalloc450, jemalloc, cracklib, systemd, perl +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config, makeWrapper, ncurses, nixosTests +, libiconv, openssl, pcre2, boost, judy, bison, libxml2, libkrb5, linux-pam, curl +, libaio, libevent, jemalloc, cracklib, systemd, perl , bzip2, lz4, lzo, snappy, xz, zlib, zstd , fixDarwinDylibNames, cctools, CoreServices, less , numactl # NUMA Support , withStorageMroonga ? true, kytea, msgpack, zeromq , withStorageRocks ? true -, withStorageToku ? true }: -with stdenv.lib; +with lib; let # in mariadb # spans the whole file @@ -23,26 +22,25 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.4.15"; + version = "10.5.8"; 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 = "0cdfzr768cb7n9ag9gqahr8c6igfn513md67xn4rf98ajmnxg0r7"; + sha256 = "1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b"; name = "mariadb-${version}.tar.gz"; }; - nativeBuildInputs = [ cmake pkgconfig ] + nativeBuildInputs = [ cmake pkg-config ] ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ - ncurses openssl zlib pcre libiconv curl + ncurses openssl zlib pcre2 libiconv curl ] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ] ++ optionals stdenv.hostPlatform.isDarwin [ perl cctools CoreServices ] - ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ jemalloc450 ] - ++ optional (!stdenv.hostPlatform.isDarwin && !withStorageToku) [ jemalloc ]; + ++ optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ]; prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt @@ -100,8 +98,6 @@ common = rec { # attributes common to both builds rm -r $out/share/aclocal ''; - enableParallelBuilding = true; - passthru.mysqlVersion = "5.7"; passthru.tests = { @@ -176,6 +172,7 @@ server = stdenv.mkDerivation (common // { "-DWITH_INNODB_DISALLOW_WRITES=ON" "-DWITHOUT_EXAMPLE=1" "-DWITHOUT_FEDERATED=1" + "-DWITHOUT_TOKUDB=1" ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [ "-DWITH_NUMA=ON" ] ++ optional (!withStorageMroonga) [ @@ -184,13 +181,12 @@ server = stdenv.mkDerivation (common // { "-DWITHOUT_ROCKSDB=1" ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageRocks) [ "-DWITH_ROCKSDB_JEMALLOC=ON" - ] ++ optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isMusl || !withStorageToku) [ - "-DWITHOUT_TOKUDB=1" - ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ - "-DWITH_JEMALLOC=static" - ] ++ optional stdenv.hostPlatform.isDarwin [ + ] ++ optional (!stdenv.hostPlatform.isDarwin) [ + "-DWITH_JEMALLOC=yes" + ] ++ optionals stdenv.hostPlatform.isDarwin [ "-DPLUGIN_AUTH_PAM=OFF" "-DWITHOUT_OQGRAPH=1" + "-DWITHOUT_PLUGIN_S3=1" ]; preConfigure = optionalString (!stdenv.hostPlatform.isDarwin) '' @@ -200,7 +196,6 @@ server = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' chmod +x "$out"/bin/wsrep_sst_common rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} - rm -r "$out"/data # Don't need testing data '' + optionalString withStorageMroonga '' mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql '' + optionalString (!stdenv.hostPlatform.isDarwin) '' |