treewide: Fix mysql alias deprecation breakage

62733b37b4a866cabafe1fc8bb7415240126eb0b broke evaluation in all
places `pkgs.mysql` was used. Fix this by changing all occurrences to
`pkgs.mariadb`.

talyz 59e0120a f36a65f6

Changed files
+16 -16
nixos
pkgs
development
lua-modules
+2 -2
nixos/modules/services/backup/mysql-backup.nix
···
let
-
inherit (pkgs) mysql gzip;
+
inherit (pkgs) mariadb gzip;
cfg = config.services.mysqlBackup;
defaultUser = "mysqlbackup";
···
'';
backupDatabaseScript = db: ''
dest="${cfg.location}/${db}.gz"
-
if ${mysql}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then
+
if ${mariadb}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then
mv $dest.tmp $dest
echo "Backed up to $dest"
else
+1 -1
nixos/modules/services/databases/mysql.nix
···
package = mkOption {
type = types.package;
-
example = literalExample "pkgs.mysql";
+
example = literalExample "pkgs.mariadb";
description = "
Which MySQL derivation to use. MariaDB packages are supported too.
";
+2 -2
nixos/modules/services/video/epgstation/default.nix
···
# NOTE: Use password authentication, since mysqljs does not yet support auth_socket
if [ ! -e /var/lib/epgstation/db-created ]; then
-
${pkgs.mysql}/bin/mysql -e \
+
${pkgs.mariadb}/bin/mysql -e \
"GRANT ALL ON \`${cfg.database.name}\`.* TO '${username}'@'localhost' IDENTIFIED by '$DB_PASSWORD';"
touch /var/lib/epgstation/db-created
fi
···
services.mysql = {
enable = mkDefault true;
-
package = mkDefault pkgs.mysql;
+
package = mkDefault pkgs.mariadb;
ensureDatabases = [ cfg.database.name ];
# FIXME: enable once mysqljs supports auth_socket
# ensureUsers = [ {
+1 -1
nixos/modules/services/web-apps/keycloak.nix
···
services.postgresql.enable = lib.mkDefault createLocalPostgreSQL;
services.mysql.enable = lib.mkDefault createLocalMySQL;
-
services.mysql.package = lib.mkIf createLocalMySQL pkgs.mysql;
+
services.mysql.package = lib.mkIf createLocalMySQL pkgs.mariadb;
};
meta.doc = ./keycloak.xml;
+1 -1
nixos/modules/services/web-apps/tt-rss.nix
···
services.mysql = mkIf mysqlLocal {
enable = true;
-
package = mkDefault pkgs.mysql;
+
package = mkDefault pkgs.mariadb;
ensureDatabases = [ cfg.database.name ];
ensureUsers = [
{
+1 -1
nixos/tests/bitwarden.nix
···
GRANT ALL ON `bitwarden`.* TO 'bitwardenuser'@'localhost';
FLUSH PRIVILEGES;
'';
-
package = pkgs.mysql;
+
package = pkgs.mariadb;
};
services.bitwarden_rs.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden";
+1 -1
nixos/tests/matomo.nix
···
};
services.mysql = {
enable = true;
-
package = pkgs.mysql;
+
package = pkgs.mariadb;
};
services.nginx.enable = true;
};
+1 -1
nixos/tests/mysql/mysql-autobackup.nix
···
{ pkgs, ... }:
{
services.mysql.enable = true;
-
services.mysql.package = pkgs.mysql;
+
services.mysql.package = pkgs.mariadb;
services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
services.automysqlbackup.enable = true;
+1 -1
nixos/tests/mysql/mysql-backup.nix
···
services.mysql = {
enable = true;
initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
-
package = pkgs.mysql;
+
package = pkgs.mariadb;
};
services.mysqlBackup = {
+3 -3
nixos/tests/mysql/mysql-replication.nix
···
{
services.mysql.enable = true;
-
services.mysql.package = pkgs.mysql;
+
services.mysql.package = pkgs.mariadb;
services.mysql.replication.role = "master";
services.mysql.replication.slaveHost = "%";
services.mysql.replication.masterUser = replicateUser;
···
{
services.mysql.enable = true;
-
services.mysql.package = pkgs.mysql;
+
services.mysql.package = pkgs.mariadb;
services.mysql.replication.role = "slave";
services.mysql.replication.serverId = 2;
services.mysql.replication.masterHost = nodes.master.config.networking.hostName;
···
{
services.mysql.enable = true;
-
services.mysql.package = pkgs.mysql;
+
services.mysql.package = pkgs.mariadb;
services.mysql.replication.role = "slave";
services.mysql.replication.serverId = 3;
services.mysql.replication.masterHost = nodes.master.config.networking.hostName;
+1 -1
nixos/tests/sogo.nix
···
services.mysql = {
enable = true;
-
package = pkgs.mysql;
+
package = pkgs.mariadb;
ensureDatabases = [ "sogo" ];
ensureUsers = [{
name = "sogo";
+1 -1
pkgs/development/lua-modules/overrides.nix
···
MYSQL_LIBDIR="${pkgs.libmysqlclient}/lib/mysql";
};
buildInputs = [
-
pkgs.mysql.client
+
pkgs.mariadb.client
pkgs.libmysqlclient
];
});