summary refs log tree commit diff
path: root/nixos/modules/rename.nix
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-02-26 07:54:04 -0500
committerShea Levy <shea@shealevy.com>2014-02-26 07:54:12 -0500
commit1ce6fff4e21906a3e6cfd26fdf4372f7501541cd (patch)
tree79fc51e845dd8297ecaa8a8dc49c981461f1650a /nixos/modules/rename.nix
parent2fd60ee9484fbbb412f80672367199409d58147c (diff)
downloadnixlib-1ce6fff4e21906a3e6cfd26fdf4372f7501541cd.tar
nixlib-1ce6fff4e21906a3e6cfd26fdf4372f7501541cd.tar.gz
nixlib-1ce6fff4e21906a3e6cfd26fdf4372f7501541cd.tar.bz2
nixlib-1ce6fff4e21906a3e6cfd26fdf4372f7501541cd.tar.lz
nixlib-1ce6fff4e21906a3e6cfd26fdf4372f7501541cd.tar.xz
nixlib-1ce6fff4e21906a3e6cfd26fdf4372f7501541cd.tar.zst
nixlib-1ce6fff4e21906a3e6cfd26fdf4372f7501541cd.zip
Merge mysql55 module into mysql
This also removes the default for services.mysql.package, as this should
not generally be updated automatically if we change the mysql attribute
Diffstat (limited to 'nixos/modules/rename.nix')
-rw-r--r--nixos/modules/rename.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 8393b5758f3c..f41bababd293 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -124,6 +124,8 @@ in zipModules ([]
 ++ obsolete [ "services" "mesa" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ]
 ++ obsolete [ "services" "mesa" "videoDrivers" ] [ "hardware" "opengl" "videoDrivers" ]
 
+++ obsolete [ "services" "mysql55" ] [ "services" "mysql" ]
+
 # Options that are obsolete and have no replacement.
 ++ obsolete' [ "boot" "loader" "grub" "bootDevice" ]
 ++ obsolete' [ "boot" "initrd" "luks" "enable" ]