From 5b759293e09a062373d4b2843c5bad89d5a47165 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 3 Feb 2017 03:15:56 +0300 Subject: [PATCH] modules lib: type description in type error message --- lib/modules.nix | 2 +- lib/tests/modules.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 256d49ba27d8..4eee41306cd7 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 e0774383720b..8b476a5d3dcc 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 <