From 66b9f32a0e02d959d399596bd38c2c9d66986a46 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 May 2020 22:07:46 +0000 Subject: nixos/public-inbox: correctly merge config This needs to be defined as an attribute set two layers deep so that multiple settings in the same namespace, declared in two different modules, will be merged together. For example, the following previously wouldn't be merged properly: { ... }: { imports = [ ( { ... }: { services.public-inbox.config.publicinbox.listid = "foo.example.com; } ) ]; services.public-inbox.config.publicinbox.css = "https://example.com/pi.css"; } --- nixpkgs/nixos/modules/services/mail/public-inbox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixpkgs/nixos/modules/services/mail/public-inbox.nix b/nixpkgs/nixos/modules/services/mail/public-inbox.nix index f6c08bf2e45b..d503f5aa2ef6 100644 --- a/nixpkgs/nixos/modules/services/mail/public-inbox.nix +++ b/nixpkgs/nixos/modules/services/mail/public-inbox.nix @@ -318,7 +318,7 @@ in }; config = mkOption { - type = types.attrs; + type = with types; attrsOf attrs; default = {}; description = '' Additional structured config for the public-inbox config file -- cgit 1.4.1