diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-28 22:05:36 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-28 22:05:36 +0200 |
| commit | 03de4c02fbd35d1b730ba0957f71df9a7a82bacf (patch) | |
| tree | 78ed2f7dfa2efae85c9a76dd53320d875a8ff678 /nixos/modules/services/databases | |
| parent | 99d25675152f30caf6354db93f01fac87f640c8f (diff) | |
| parent | e27e3ae169d4ac64856befb6bbf044f2153e337d (diff) | |
| download | nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.gz nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.bz2 nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.lz nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.xz nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.tar.zst nixlib-03de4c02fbd35d1b730ba0957f71df9a7a82bacf.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/services/databases')
| -rw-r--r-- | nixos/modules/services/databases/mysql.nix | 8 | ||||
| -rw-r--r-- | nixos/modules/services/databases/rethinkdb.nix | 5 |
2 files changed, 2 insertions, 11 deletions
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 44183788d936..51885881cf73 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -32,13 +32,7 @@ in services.mysql = { - enable = mkOption { - type = types.bool; - default = false; - description = " - Whether to enable the MySQL server. - "; - }; + enable = mkEnableOption "MySQL server"; package = mkOption { type = types.package; diff --git a/nixos/modules/services/databases/rethinkdb.nix b/nixos/modules/services/databases/rethinkdb.nix index f18fbaf5b062..c764d6c21c6c 100644 --- a/nixos/modules/services/databases/rethinkdb.nix +++ b/nixos/modules/services/databases/rethinkdb.nix @@ -15,10 +15,7 @@ in services.rethinkdb = { - enable = mkOption { - default = false; - description = "Whether to enable the RethinkDB server."; - }; + enable = mkEnableOption "RethinkDB server"; #package = mkOption { # default = pkgs.rethinkdb; |