commit 7cd6b3cf7666455319769ff7c863ab8a08a1720e · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

Revert change of path type

The change caused lots of evaluation errors, since it caused derivations to no longer be valid paths as well.

Benno Fünfstück 10 years ago 7cd6b3cf e6f1e1e5

options

unified split

Changed files

+1 -2

lib

types.nix

+1 -2

lib/types.nix

···

       103
       103
        
           path = mkOptionType {

     

       104
       104
        
             name = "path";

     

       105
       105
        
             # Hacky: there is no ‘isPath’ primop.

     

       106
       106
       -
             # need to check isString first because otherwise toString throws an error.

     

       107
       107
       -
             check = x: builtins.isString x && builtins.substring 0 1 (toString x) == "/";

     

       106
       106
       +
             check = x: builtins.substring 0 1 (toString x) == "/";

     

       108
       107
        
             merge = mergeOneOption;

     

       109
       108
        
           };

     

       110
       109