nixos/unbound: allow list of strings in top-level settings option type#121927
Merged
roberth merged 1 commit intoNixOS:masterfrom May 8, 2021
Merged
nixos/unbound: allow list of strings in top-level settings option type#121927roberth merged 1 commit intoNixOS:masterfrom
roberth merged 1 commit intoNixOS:masterfrom
Conversation
github-actions
bot
added
6.topic: nixos
ofborg
bot
added
10.rebuild-darwin: 0
roberth
reviewed
May 7, 2021
Member
There was a problem hiding this comment.
Suggested change
| settingsType = oneOf [ string (attrsOf validSettingsTypes) ]; | |
| settingsType = oneOf [ str (attrsOf validSettingsTypes) ]; |
string is a deprecated type.
Contributor
There was a problem hiding this comment.
The intermediate types could also use a human readable description to avoid gollum showing up in error messages:
error: A definition for option services.unbound.settings.include.[definition 1-entry 1] is not of type attribute set of signed integer or string or boolean or floating point number or list of signed integer or string or boolean or floating point numberss.
Member
Author
There was a problem hiding this comment.
Fixed the deprecated string type. Sorry about that.
Member
There was a problem hiding this comment.
Don't worry about it. We don't have a usable warning for it. #99132 broke other things.
Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
rissson
force-pushed
the
nixos-unbound-fix-top-level-include
branch
from
d66dc21 to
0340cd2
Compare
roberth
approved these changes
May 8, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Closes #121878
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)