Merge pull request #132916 from helsinki-systems/upd/mariadb

mariadb: 10.5.11 -> 10.6.3, mariadb-galera: 26.4.8 -> 26.4.9, libmysqlclient: 3.1.13 -> 3.2.3
This commit is contained in:
ajs124 2021-08-19 17:09:35 +02:00 committed by GitHub
commit 9000cd88c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 45 additions and 14 deletions

View File

@ -1019,6 +1019,24 @@ Superuser created successfully.
sign OCSP responses and server certificates.
</para>
</listitem>
<listitem>
<para>
MariaDB was upgraded from 10.5.x to 10.6.x. Please read the
<link xlink:href="https://mariadb.com/kb/en/changes-improvements-in-mariadb-106/">upstream
release notes</link> for changes and upgrade instructions.
</para>
</listitem>
<listitem>
<para>
The MariaDB C client library, also known as libmysqlclient or
mariadb-connector-c, was upgraded from 3.1.x to 3.2.x. While
this should hopefully not have any impact, this upgrade comes
with some changes to default behavior, so you might want to
review the
<link xlink:href="https://mariadb.com/kb/en/changes-and-improvements-in-mariadb-connector-c-32/">upstream
release notes</link>.
</para>
</listitem>
</itemizedlist>
</section>
</section>

View File

@ -290,3 +290,7 @@ To be able to access the web UI this port needs to be opened in the firewall.
- Zfs: `latestCompatibleLinuxPackages` is now exported on the zfs package. One can use `boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;` to always track the latest compatible kernel with a given version of zfs.
- Nginx will use the value of `sslTrustedCertificate` if provided for a virtual host, even if `enableACME` is set. This is useful for providers not using the same certificate to sign OCSP responses and server certificates.
- MariaDB was upgraded from 10.5.x to 10.6.x. Please read the [upstream release notes](https://mariadb.com/kb/en/changes-improvements-in-mariadb-106/) for changes and upgrade instructions.
- The MariaDB C client library, also known as libmysqlclient or mariadb-connector-c, was upgraded from 3.1.x to 3.2.x. While this should hopefully not have any impact, this upgrade comes with some changes to default behavior, so you might want to review the [upstream release notes](https://mariadb.com/kb/en/changes-and-improvements-in-mariadb-connector-c-32/).

View File

@ -73,6 +73,7 @@ in
services.automysqlbackup.config = mapAttrs (name: mkDefault) {
mysql_dump_username = user;
mysql_dump_host = "localhost";
mysql_dump_socket = "/run/mysqld/mysqld.sock";
backup_dir = "/var/backup/mysql";
db_exclude = [ "information_schema" "performance_schema" ];
mailcontent = "stdout";

View File

@ -0,0 +1,6 @@
{ callPackage, ... } @ args:
callPackage ./. (args // {
version = "3.2.3";
sha256 = "1x1i4ck4c3sgkw083v02zk3rbkm5h0x1vl4m58j95q1qcijkiamn";
})

View File

@ -22,14 +22,14 @@ mariadb = server // {
};
common = rec { # attributes common to both builds
version = "10.5.11";
version = "10.6.3";
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 = "0yn4bhqciy6jyig31rmkjc588l03k4bj3194yf9y6373bxh5643n";
sha256 = "1nqq1g6h2gvsraqziv2qq42v7y6fzbfw357mh3d1zv7md9h2bhav";
name = "mariadb-${version}.tar.gz";
};

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "mariadb-galera";
version = "26.4.8";
version = "26.4.9";
src = fetchFromGitHub {
owner = "codership";
repo = "galera";
rev = "release_${version}";
sha256 = "0rx710dfijiykpi41rhxx8vafk07bffv2nbl3d4ggc32rzv88369";
sha256 = "1nf8vv0b9v7rjsxl93avgvv0lz5jjg91brnric0dhlnp2dzzxi6g";
fetchSubmodules = true;
};

View File

@ -1,16 +1,16 @@
{ lib, stdenv, fetchurl, makeWrapper, mariadb, mailutils, pbzip2, pigz, bzip2, gzip }:
{ lib, stdenv, fetchFromGitHub, makeWrapper, mariadb, mailutils, pbzip2, pigz, bzip2, gzip }:
stdenv.mkDerivation rec {
pname = "automysqlbackup";
version = "3.0_rc6";
version = "3.0.6";
src = fetchurl {
url = "mirror://sourceforge/automysqlbackup/AutoMySQLBackup/AutoMySQLBackup%20VER%203.0/automysqlbackup-v${version}.tar.gz";
sha256 = "1h1wq86q6my1a682nr8pjagjhai4lxz967m17lhpw1vb116hd7l8";
src = fetchFromGitHub {
owner = "sixhop";
repo = pname;
rev = version;
sha256 = "0lki2049npc38r8m08garymywp1rzgflm0mxsfdznn9jfp4pk2lp";
};
sourceRoot = ".";
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A script to run daily, weekly and monthly backups for your MySQL database";
homepage = "https://sourceforge.net/projects/automysqlbackup/";
homepage = "https://github.com/sixhop/AutoMySQLBackup";
platforms = platforms.linux;
maintainers = [ maintainers.aanderse ];
license = licenses.gpl2Plus;

View File

@ -20163,10 +20163,12 @@ with pkgs;
rpcsvc-proto = callPackage ../tools/misc/rpcsvc-proto { };
libmysqlclient = libmysqlclient_3_1;
libmysqlclient = libmysqlclient_3_2;
libmysqlclient_3_1 = mariadb-connector-c_3_1;
mariadb-connector-c = mariadb-connector-c_3_1;
libmysqlclient_3_2 = mariadb-connector-c_3_2;
mariadb-connector-c = mariadb-connector-c_3_2;
mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { };
mariadb-connector-c_3_2 = callPackage ../servers/sql/mariadb/connector-c/3_2.nix { };
mariadb-galera = callPackage ../servers/sql/mariadb/galera {
asio = asio_1_10;