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/services/video | |
| 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/services/video')
| -rw-r--r-- | nixos/modules/services/video/epgstation/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
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 = [ { |