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:
Robert Hensing 2021-05-08 22:00:57 +02:00 committed by GitHub
commit 4433ba90aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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