BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #43094 from grahamc/fix-quagga-docs

Browse source 
quagga module: Use a deep merge via imports instead of the shallow merge
This commit is contained in:
Graham Christensen 2018-07-06 17:47:05 -04:00 committed by GitHub
commit 96305ca6f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
nixos/modules/services/networking/quagga.nix
View file

@ -95,26 +95,25 @@ in
{
###### interface
options.services.quagga =
imports = [
{
options.services.quagga = {
zebra = (serviceOptions "zebra") // {
enable = mkOption {
type = types.bool;
default = any isEnabled services;
description = ''
Whether to enable the Zebra routing manager.
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.
'';
The Zebra routing manager is automatically enabled
if any routing protocols are configured.
'';
};
};
};
} // (genAttrs services serviceOptions);
}
{ options.services.quagga = (genAttrs services serviceOptions); }
];
###### implementation