pyrox.dev / nixpkgs
lol
fork atom

lib/types: Fix coercedTo check

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.

Silvan Mosberger ef8996f1 85b5fc7c

options
unified split
Changed files
+1 -1
lib
types.nix
+1 -1
lib/types.nix 
···

       
420

       
 

       
      mkOptionType rec {


     

       
421

       
 

       
        name = "coercedTo";


     

       
422

       
 

       
        description = "${finalType.description} or ${coercedType.description}";


     

       
423

       
-

       
        check = x: finalType.check x || coercedType.check x;


     

       
424

       
 

       
        merge = loc: defs:


     

       
425

       
 

       
          let


     

       
426

       
 

       
            coerceVal = val:


     
···

       
420

       
 

       
      mkOptionType rec {


     

       
421

       
 

       
        name = "coercedTo";


     

       
422

       
 

       
        description = "${finalType.description} or ${coercedType.description}";


     

       
423

       
+

       
        check = x: finalType.check x || (coercedType.check x && finalType.check (coerceFunc x));


     

       
424

       
 

       
        merge = loc: defs:


     

       
425

       
 

       
          let


     

       
426

       
 

       
            coerceVal = val: