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

lib/types: Fix coercedTo check

Browse Source 
Without this change

  (coercedTo str toInt int).check "foo"

would evaluate to true, even though

  (coercedTo str toInt int).merge {} [{ value = "foo"; }]

will throw an error because "foo" can't be coerced to an int.
This commit is contained in:
Silvan Mosberger 2018-03-09 13:41:55 +01:00 committed by Profpatsch
parent 85b5fc7c98
commit ef8996f15e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/types.nix
View File

@ -420,7 +420,7 @@ rec {
mkOptionType rec { mkOptionType rec {
name = "coercedTo"; name = "coercedTo";
description = "${finalType.description} or ${coercedType.description}"; description = "${finalType.description} or ${coercedType.description}";
check = x: finalType.check x || coercedType.check x; check = x: finalType.check x || (coercedType.check x && finalType.check (coerceFunc x));
merge = loc: defs: merge = loc: defs:
let let
coerceVal = val: coerceVal = val: