diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-02-03 03:15:56 +0300 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2017-02-03 11:28:33 +0100 |
| commit | 5b759293e09a062373d4b2843c5bad89d5a47165 (patch) | |
| tree | c1aed3aa878e6d52bb0215343e5310e24a78cb39 /lib | |
| parent | 025eae1a8cf6abdb6bae51c9c3406cb36356608f (diff) | |
| download | nixpkgs-5b759293e09a062373d4b2843c5bad89d5a47165.tar nixpkgs-5b759293e09a062373d4b2843c5bad89d5a47165.tar.gz nixpkgs-5b759293e09a062373d4b2843c5bad89d5a47165.tar.bz2 nixpkgs-5b759293e09a062373d4b2843c5bad89d5a47165.tar.lz nixpkgs-5b759293e09a062373d4b2843c5bad89d5a47165.tar.xz nixpkgs-5b759293e09a062373d4b2843c5bad89d5a47165.tar.zst nixpkgs-5b759293e09a062373d4b2843c5bad89d5a47165.zip | |
modules lib: type description in type error message
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/modules.nix | 2 | ||||
| -rwxr-xr-x | lib/tests/modules.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/modules.nix b/lib/modules.nix index 256d49ba27d..4eee41306cd 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -326,7 +326,7 @@ rec { # Type-check the remaining definitions, and merge them. mergedValue = foldl' (res: def: if type.check def.value then res - else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.name}.") + else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.description}.") (type.merge loc defsFinal) defsFinal; isDefined = defsFinal != []; diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index e0774383720..8b476a5d3dc 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -118,7 +118,7 @@ checkConfigOutput "true" "$@" ./define-module-check.nix # Check coerced value. checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix -checkConfigError 'The option value .* in .* is not a coercedTo.' config.value ./declare-coerced-value.nix ./define-value-list.nix +checkConfigError 'The option value .* in .* is not a string or integer.' config.value ./declare-coerced-value.nix ./define-value-list.nix cat <<EOF ====== module tests ====== |