From 5634f0887391419b10a3e8c43c6377214b79b115 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 20 Jan 2023 13:45:08 +0100 Subject: [PATCH] rtl: make `extraConfig` recursively mergeable Previously, when merging different definitions of `extraConfig`, only the top-level attrset was merged. Example: The two separate settings nodes.lnd.extraConfig.Settings.userPersona = "MERCHANT"; nodes.lnd.extraConfig.Settings.logLevel = "DEBUG"; were previously merged into nodes.lnd.extraConfig.Settings = { logLevel = "DEBUG" }; (The last definition has precedence.) --- modules/rtl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rtl.nix b/modules/rtl.nix index 0ddea12..19bc118 100644 --- a/modules/rtl.nix +++ b/modules/rtl.nix @@ -27,7 +27,7 @@ let description = mdDoc "Enable the clightning node interface."; }; extraConfig = mkOption { - type = types.attrs; + type = with types; attrsOf anything; default = {}; example = { Settings.userPersona = "MERCHANT"; @@ -52,7 +52,7 @@ let description = mdDoc "Enable swaps with lightning-loop."; }; extraConfig = mkOption { - type = types.attrs; + type = with types; attrsOf anything; default = {}; example = { Settings.userPersona = "MERCHANT";