public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/modules: Fix type checks not being done before merging

Browse Source 
Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
This commit is contained in:
Silvan Mosberger 2020-03-16 21:10:05 +01:00
parent 15c873b486
commit e931de58a2
No known key found for this signature in database
GPG Key ID: E8F1E9EAD284E17D
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/modules.nix
View File

@ -416,10 +416,9 @@ rec {
# Type-check the remaining definitions, and merge them. Or throw if no definitions. # Type-check the remaining definitions, and merge them. Or throw if no definitions.
mergedValue = mergedValue =
if isDefined then if isDefined then
foldl' (res: def: if all (def: type.check def.value) defsFinal then type.merge loc defsFinal
if type.check def.value then res else let firstInvalid = findFirst (def: ! type.check def.value) null defsFinal;
else throw "The option value `${showOption loc}' in `${def.file}' is not of type `${type.description}'." in throw "The option value `${showOption loc}' in `${firstInvalid.file}' is not of type `${type.description}'."
) (type.merge loc defsFinal) defsFinal
else else
# (nixos-option detects this specific error message and gives it special # (nixos-option detects this specific error message and gives it special
# handling. If changed here, please change it there too.) # handling. If changed here, please change it there too.)

4
lib/tests/modules.sh
View File

@ -198,6 +198,10 @@ checkConfigOutput "empty" config.value.foo ./declare-lazyAttrsOf.nix ./attrsOf-c
checkConfigError 'The option path .* is an attribute set of options, but it is defined to not be an attribute set in' \ checkConfigError 'The option path .* is an attribute set of options, but it is defined to not be an attribute set in' \
config.value ./declare-option-set.nix ./define-value-int-zero.nix config.value ./declare-option-set.nix ./define-value-int-zero.nix
# Even with multiple assignments, a type error should be thrown if any of them aren't valid
checkConfigError 'The option value .* in .* is not of type .*' \
config.value ./declare-int-unsigned-value.nix ./define-value-list.nix ./define-value-int-positive.nix
cat <<EOF cat <<EOF
====== module tests ====== ====== module tests ======
$pass Pass $pass Pass