diff options
author | Joachim F <joachifm@users.noreply.github.com> | 2016-10-01 17:57:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-01 17:57:45 +0200 |
commit | 7e80c42b0ead918defafb92893c605983319e418 (patch) | |
tree | 057bf37267cf75493af45cf9e92f3337b5b55e80 /nixos/modules/services/monitoring | |
parent | 46693bd6e824ead3cf46c3deace190969a249010 (diff) | |
parent | f9239053465d06a823268c962505d3327049f12a (diff) | |
download | nixlib-7e80c42b0ead918defafb92893c605983319e418.tar nixlib-7e80c42b0ead918defafb92893c605983319e418.tar.gz nixlib-7e80c42b0ead918defafb92893c605983319e418.tar.bz2 nixlib-7e80c42b0ead918defafb92893c605983319e418.tar.lz nixlib-7e80c42b0ead918defafb92893c605983319e418.tar.xz nixlib-7e80c42b0ead918defafb92893c605983319e418.tar.zst nixlib-7e80c42b0ead918defafb92893c605983319e418.zip |
Merge pull request #18511 from ericsagnes/feat/remove-optionSet
modules: optionSet -> submodule
Diffstat (limited to 'nixos/modules/services/monitoring')
-rw-r--r-- | nixos/modules/services/monitoring/smartd.nix | 3 | ||||
-rw-r--r-- | nixos/modules/services/monitoring/ups.nix | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index 1017005226b2..f2834f288f90 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -197,8 +197,7 @@ in devices = mkOption { default = []; example = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ]; - type = types.listOf types.optionSet; - options = [ smartdOpts ]; + type = with types; listOf (submodule smartdOpts); description = "List of devices to monitor."; }; diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index febf0c95f5bd..c4c4ed227b35 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -169,8 +169,7 @@ in monitoring directly. These are usually attached to serial ports, but USB devices are also supported. ''; - type = types.attrsOf types.optionSet; - options = [ upsOptions ]; + type = with types; attrsOf (submodule upsOptions); }; }; |