diff options
author | talyz <kim.lindberger@gmail.com> | 2021-06-04 16:08:41 +0200 |
---|---|---|
committer | talyz <kim.lindberger@gmail.com> | 2021-06-04 21:42:08 +0200 |
commit | 59e0120aa5c1241d48048afa615e25c65d7e366d (patch) | |
tree | 111459a037a28160ca6b46e5b624d4e03a2ad2d9 /nixos/modules | |
parent | f36a65f6e2e9f3641f12c7d6e48a5ec4b5c5394b (diff) | |
download | nixpkgs-59e0120aa5c1241d48048afa615e25c65d7e366d.tar nixpkgs-59e0120aa5c1241d48048afa615e25c65d7e366d.tar.gz nixpkgs-59e0120aa5c1241d48048afa615e25c65d7e366d.tar.bz2 nixpkgs-59e0120aa5c1241d48048afa615e25c65d7e366d.tar.lz nixpkgs-59e0120aa5c1241d48048afa615e25c65d7e366d.tar.xz nixpkgs-59e0120aa5c1241d48048afa615e25c65d7e366d.tar.zst nixpkgs-59e0120aa5c1241d48048afa615e25c65d7e366d.zip |
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`.
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/backup/mysql-backup.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/databases/mysql.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/video/epgstation/default.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/web-apps/keycloak.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/web-apps/tt-rss.nix | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index 506ded5e9e8..9fca2100273 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -4,7 +4,7 @@ with lib; let - inherit (pkgs) mysql gzip; + inherit (pkgs) mariadb gzip; cfg = config.services.mysqlBackup; defaultUser = "mysqlbackup"; @@ -20,7 +20,7 @@ let ''; 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 diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index cf105daeb04..2d8d613ed88 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -34,7 +34,7 @@ in package = mkOption { type = types.package; - example = literalExample "pkgs.mysql"; + example = literalExample "pkgs.mariadb"; description = " Which MySQL derivation to use. MariaDB packages are supported too. "; diff --git a/nixos/modules/services/video/epgstation/default.nix b/nixos/modules/services/video/epgstation/default.nix index 8d6d431fa55..b13393c8983 100644 --- a/nixos/modules/services/video/epgstation/default.nix +++ b/nixos/modules/services/video/epgstation/default.nix @@ -27,7 +27,7 @@ let # 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 @@ -224,7 +224,7 @@ in 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 = [ { diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index f0b9e60116d..dc66c296656 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -728,7 +728,7 @@ in 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; diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 6a29f10d119..b78487cc928 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -644,7 +644,7 @@ let services.mysql = mkIf mysqlLocal { enable = true; - package = mkDefault pkgs.mysql; + package = mkDefault pkgs.mariadb; ensureDatabases = [ cfg.database.name ]; ensureUsers = [ { |