mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 17:33:09 +00:00
Merge pull request #121927 from rissson/nixos-unbound-fix-top-level-include
nixos/unbound: allow list of strings in top-level settings option type
This commit is contained in:
commit
4433ba90aa
@ -102,8 +102,8 @@ in {
|
|||||||
freeformType = let
|
freeformType = let
|
||||||
validSettingsPrimitiveTypes = oneOf [ int str bool float ];
|
validSettingsPrimitiveTypes = oneOf [ int str bool float ];
|
||||||
validSettingsTypes = oneOf [ validSettingsPrimitiveTypes (listOf validSettingsPrimitiveTypes) ];
|
validSettingsTypes = oneOf [ validSettingsPrimitiveTypes (listOf validSettingsPrimitiveTypes) ];
|
||||||
settingsType = (attrsOf validSettingsTypes);
|
settingsType = oneOf [ str (attrsOf validSettingsTypes) ];
|
||||||
in attrsOf (oneOf [ string settingsType (listOf settingsType) ])
|
in attrsOf (oneOf [ settingsType (listOf settingsType) ])
|
||||||
// { description = ''
|
// { description = ''
|
||||||
unbound.conf configuration type. The format consist of an attribute
|
unbound.conf configuration type. The format consist of an attribute
|
||||||
set of settings. Each settings can be either one value, a list of
|
set of settings. Each settings can be either one value, a list of
|
||||||
|
Loading…
Reference in New Issue
Block a user