public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/znc: Fix confOptions.extraZncConf being applied to wrong section

Browse Source 
This bug was introduced in https://github.com/NixOS/nixpkgs/pull/41467
This commit is contained in:
Silvan Mosberger 2018-10-20 20:36:18 +02:00
parent ef10c80847
commit 039fc37f9c
No known key found for this signature in database
GPG Key ID: 9424360B4B85C9E7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/networking/znc/options.nix
View File

@ -254,8 +254,9 @@ in
listToAttrs (map (n: nameValuePair "#${n}" (mkDefault {})) net.channels); listToAttrs (map (n: nameValuePair "#${n}" (mkDefault {})) net.channels);
extraConfig = if net.extraConf == "" then mkDefault null else net.extraConf; extraConfig = if net.extraConf == "" then mkDefault null else net.extraConf;
}) c.networks; }) c.networks;
extraConfig = [ c.passBlock ] ++ optional (c.extraZncConf != "") c.extraZncConf; extraConfig = [ c.passBlock ];
}; };
extraConfig = optional (c.extraZncConf != "") c.extraZncConf;
}; };
}; };