From 039fc37f9c7eac5d7f648b7fa21227726cb39319 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 20 Oct 2018 20:36:18 +0200 Subject: [PATCH 1/2] nixos/znc: Fix confOptions.extraZncConf being applied to wrong section This bug was introduced in https://github.com/NixOS/nixpkgs/pull/41467 --- nixos/modules/services/networking/znc/options.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/znc/options.nix b/nixos/modules/services/networking/znc/options.nix index 505ebb3bf0ad..29d16e20318b 100644 --- a/nixos/modules/services/networking/znc/options.nix +++ b/nixos/modules/services/networking/znc/options.nix @@ -254,8 +254,9 @@ in listToAttrs (map (n: nameValuePair "#${n}" (mkDefault {})) net.channels); extraConfig = if net.extraConf == "" then mkDefault null else net.extraConf; }) c.networks; - extraConfig = [ c.passBlock ] ++ optional (c.extraZncConf != "") c.extraZncConf; + extraConfig = [ c.passBlock ]; }; + extraConfig = optional (c.extraZncConf != "") c.extraZncConf; }; }; From 1fa1bcbab0d8cdf864cbe04076cb51bc02310b44 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 20 Oct 2018 20:56:30 +0200 Subject: [PATCH 2/2] nixos/znc: Fix confOptions.uriPrefix not being applied This was overlooked on a rebase of mine on master, when I didn't realize that in the time of me writing the znc changes this new option got introduced. --- nixos/modules/services/networking/znc/options.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/znc/options.nix b/nixos/modules/services/networking/znc/options.nix index 29d16e20318b..048dbd738630 100644 --- a/nixos/modules/services/networking/znc/options.nix +++ b/nixos/modules/services/networking/znc/options.nix @@ -239,6 +239,7 @@ in IPv4 = mkDefault true; IPv6 = mkDefault true; SSL = mkDefault c.useSSL; + URIPrefix = c.uriPrefix; }; User.${c.userName} = { Admin = mkDefault true;