diff options
| author | Graham Christensen <graham@grahamc.com> | 2018-07-06 17:47:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-06 17:47:05 -0400 |
| commit | 96305ca6f2f5b4b4e3a59fe417f0679df9346125 (patch) | |
| tree | c01bae5c947387f4aa88e0c6438cd42667339761 /nixos/modules | |
| parent | ddc7051552ebe7488850783346ad35bdc0b06dee (diff) | |
| parent | 078925c954fd2114db5a4ef976e9fb6f423c2653 (diff) | |
| download | nixpkgs-96305ca6f2f5b4b4e3a59fe417f0679df9346125.tar nixpkgs-96305ca6f2f5b4b4e3a59fe417f0679df9346125.tar.gz nixpkgs-96305ca6f2f5b4b4e3a59fe417f0679df9346125.tar.bz2 nixpkgs-96305ca6f2f5b4b4e3a59fe417f0679df9346125.tar.lz nixpkgs-96305ca6f2f5b4b4e3a59fe417f0679df9346125.tar.xz nixpkgs-96305ca6f2f5b4b4e3a59fe417f0679df9346125.tar.zst nixpkgs-96305ca6f2f5b4b4e3a59fe417f0679df9346125.zip | |
Merge pull request #43094 from grahamc/fix-quagga-docs
quagga module: Use a deep merge via imports instead of the shallow merge
Diffstat (limited to 'nixos/modules')
| -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 22204e53203..5acdd5af8f8 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 |