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

mariadb: 10.4.15 -> 10.5.8

Browse Source
This commit is contained in:
Izorkin 2020-07-01 17:04:34 +03:00
parent d688f790dd
commit 91e580397e
No known key found for this signature in database
GPG Key ID: 1436C1B3F3679F09
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/doc/manual/release-notes/rl-2103.xml
View File

@ -256,6 +256,15 @@
which is the new stable release. OpenAFS 1.6 was removed. which is the new stable release. OpenAFS 1.6 was removed.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
MariaDB has been updated to 10.5.
Before you upgrade, it would be best to take a backup of your database and read
<link xlink:href="https://mariadb.com/kb/en/upgrading-from-mariadb-104-to-mariadb-105/#incompatible-changes-between-104-and-105">
Incompatible Changes Between 10.4 and 10.5</link>.
After the upgrade you will need to run <literal>mysql_upgrade</literal>.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
The TokuDB storage engine dropped in <package>mariadb</package> 10.5 and removed in <package>mariadb</package> 10.6. The TokuDB storage engine dropped in <package>mariadb</package> 10.5 and removed in <package>mariadb</package> 10.6.

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests
, libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libiconv, openssl, pcre2, boost, judy, bison, libxml2, libkrb5, linux-pam, curl
, libaio, libevent, jemalloc, cracklib, systemd, perl , libaio, libevent, jemalloc, cracklib, systemd, perl
, bzip2, lz4, lzo, snappy, xz, zlib, zstd , bzip2, lz4, lzo, snappy, xz, zlib, zstd
, fixDarwinDylibNames, cctools, CoreServices, less , fixDarwinDylibNames, cctools, CoreServices, less
@ -22,14 +22,14 @@ mariadb = server // {
}; };
common = rec { # attributes common to both builds common = rec { # attributes common to both builds
version = "10.4.15"; version = "10.5.8";
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 = "0cdfzr768cb7n9ag9gqahr8c6igfn513md67xn4rf98ajmnxg0r7"; sha256 = "1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b";
name = "mariadb-${version}.tar.gz"; name = "mariadb-${version}.tar.gz";
}; };
@ -37,7 +37,7 @@ common = rec { # attributes common to both builds
++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ buildInputs = [
ncurses openssl zlib pcre libiconv curl ncurses openssl zlib pcre2 libiconv curl
] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ] ] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ]
++ optionals stdenv.hostPlatform.isDarwin [ perl cctools CoreServices ] ++ optionals stdenv.hostPlatform.isDarwin [ perl cctools CoreServices ]
++ optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ]; ++ optional (!stdenv.hostPlatform.isDarwin) [ jemalloc ];
@ -182,7 +182,7 @@ server = stdenv.mkDerivation (common // {
] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageRocks) [ ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageRocks) [
"-DWITH_ROCKSDB_JEMALLOC=ON" "-DWITH_ROCKSDB_JEMALLOC=ON"
] ++ optional (!stdenv.hostPlatform.isDarwin) [ ] ++ optional (!stdenv.hostPlatform.isDarwin) [
"-DWITH_JEMALLOC=static" "-DWITH_JEMALLOC=yes"
] ++ optional stdenv.hostPlatform.isDarwin [ ] ++ optional stdenv.hostPlatform.isDarwin [
"-DPLUGIN_AUTH_PAM=OFF" "-DPLUGIN_AUTH_PAM=OFF"
"-DWITHOUT_OQGRAPH=1" "-DWITHOUT_OQGRAPH=1"
@ -195,7 +195,6 @@ server = stdenv.mkDerivation (common // {
postInstall = common.postInstall + '' postInstall = common.postInstall + ''
chmod +x "$out"/bin/wsrep_sst_common chmod +x "$out"/bin/wsrep_sst_common
rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest}
rm -r "$out"/data # Don't need testing data
'' + optionalString withStorageMroonga '' '' + optionalString withStorageMroonga ''
mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql
'' + optionalString (!stdenv.hostPlatform.isDarwin) '' '' + optionalString (!stdenv.hostPlatform.isDarwin) ''