···

       
103
       
103
       
 
       
    path = mkOptionType {

     

       
104
       
104
       
 
       
      name = "path";

     

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

     

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

     

       
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) == "/";

     

       
107
       
108
       
 
       
      merge = mergeOneOption;

     

       
108
       
109
       
 
       
    };

     

       
109
       
110
       
 
       


     

···

       
57
       
57
       
 
       
    environment = {

     

       
58
       
58
       
 
       


     

       
59
       
59
       
 
       
      systemPackages = mkOption {

     

       
60
       
60
       
-
       
        type = types.listOf types.path;

     

       
60
       
60
       
+
       
        type = types.listOf types.package;

     

       
61
       
61
       
 
       
        default = [];

     

       
62
       
62
       
 
       
        example = literalExample "[ pkgs.firefox pkgs.thunderbird ]";

     

       
63
       
63
       
 
       
        description = ''