public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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

13
nixos/modules/services/networking/quagga.nix
View File

@ -95,12 +95,10 @@ in
{ {
###### interface ###### interface
imports = [
options.services.quagga =
{ {
options.services.quagga = {
zebra = (serviceOptions "zebra") // { zebra = (serviceOptions "zebra") // {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
default = any isEnabled services; default = any isEnabled services;
@ -111,10 +109,11 @@ in
if any routing protocols are configured. if any routing protocols are configured.
''; '';
}; };
}; };
};
} // (genAttrs services serviceOptions); }
{ options.services.quagga = (genAttrs services serviceOptions); }
];
###### implementation ###### implementation