diff options
author | Graham Christensen <graham@grahamc.com> | 2018-07-05 22:10:44 -0400 |
---|---|---|
committer | Graham Christensen <graham@grahamc.com> | 2018-07-05 22:11:29 -0400 |
commit | 078925c954fd2114db5a4ef976e9fb6f423c2653 (patch) | |
tree | ec74d5e7c43bc36a344897a31e27bc6e1099ca10 /nixos/modules/services/networking | |
parent | 62f47c56b7db386c5f0040f7d2d5df3005c8910a (diff) | |
download | nixlib-078925c954fd2114db5a4ef976e9fb6f423c2653.tar nixlib-078925c954fd2114db5a4ef976e9fb6f423c2653.tar.gz nixlib-078925c954fd2114db5a4ef976e9fb6f423c2653.tar.bz2 nixlib-078925c954fd2114db5a4ef976e9fb6f423c2653.tar.lz nixlib-078925c954fd2114db5a4ef976e9fb6f423c2653.tar.xz nixlib-078925c954fd2114db5a4ef976e9fb6f423c2653.tar.zst nixlib-078925c954fd2114db5a4ef976e9fb6f423c2653.zip |
quagga module: Use a deep merge via imports instead of the shallow merge
The deep merge caused all the options to be unset when generating docs, unless quagga was enabled. Using imports, instead, properly allows the documentation to be generated.
Diffstat (limited to 'nixos/modules/services/networking')
-rw-r--r-- | nixos/modules/services/networking/quagga.nix | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/nixos/modules/services/networking/quagga.nix b/nixos/modules/services/networking/quagga.nix index 22204e53203c..5acdd5af8f8f 100644 --- a/nixos/modules/services/networking/quagga.nix +++ b/nixos/modules/services/networking/quagga.nix @@ -95,26 +95,25 @@ in { ###### interface - - options.services.quagga = + imports = [ { - - zebra = (serviceOptions "zebra") // { - - enable = mkOption { - type = types.bool; - default = any isEnabled services; - description = '' - Whether to enable the Zebra routing manager. - - The Zebra routing manager is automatically enabled - if any routing protocols are configured. - ''; + options.services.quagga = { + zebra = (serviceOptions "zebra") // { + enable = mkOption { + type = types.bool; + default = any isEnabled services; + description = '' + Whether to enable the Zebra routing manager. + + The Zebra routing manager is automatically enabled + if any routing protocols are configured. + ''; + }; }; - }; - - } // (genAttrs services serviceOptions); + } + { options.services.quagga = (genAttrs services serviceOptions); } + ]; ###### implementation |