commit 08e8701673a84b800e0960c50f78793a23e635ba · pyrox.dev/nixpkgs

+6

lib/tests/modules.sh

···

       143
       143
        
       checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string convertible to it' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix

     

       144
       144
        
       checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix

     

       145
       145
        
       

     

       146
       146
       +
       # Check loaOf with long list.

     

       147
       147
       +
       checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-long-list.nix

     

       148
       148
       +
       

     

       149
       149
       +
       # Check loaOf with many merges of lists.

     

       150
       150
       +
       checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-many-list-merges.nix

     

       151
       151
       +
       

     

       146
       152
        
       cat <<EOF

     

       147
       153
        
       ====== module tests ======

     

       148
       154
        
       $pass Pass

+19

lib/tests/modules/loaOf-with-long-list.nix

···

       1
       1
       +
       { config, lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         options = {

     

       5
       5
       +
           loaOfInt = lib.mkOption {

     

       6
       6
       +
             type = lib.types.loaOf lib.types.int;

     

       7
       7
       +
           };

     

       8
       8
       +
       

     

       9
       9
       +
           result = lib.mkOption {

     

       10
       10
       +
             type = lib.types.str;

     

       11
       11
       +
           };

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         config = {

     

       15
       15
       +
           loaOfInt = [ 1 2 3 4 5 6 7 8 9 10 ];

     

       16
       16
       +
       

     

       17
       17
       +
           result = toString (lib.attrValues config.loaOfInt);

     

       18
       18
       +
         };

     

       19
       19
       +
       }

+19

lib/tests/modules/loaOf-with-many-list-merges.nix

···

       1
       1
       +
       { config, lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         options = {

     

       5
       5
       +
           loaOfInt = lib.mkOption {

     

       6
       6
       +
             type = lib.types.loaOf lib.types.int;

     

       7
       7
       +
           };

     

       8
       8
       +
       

     

       9
       9
       +
           result = lib.mkOption {

     

       10
       10
       +
             type = lib.types.str;

     

       11
       11
       +
           };

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         config = {

     

       15
       15
       +
           loaOfInt = lib.mkMerge (map lib.singleton [ 1 2 3 4 5 6 7 8 9 10 ]);

     

       16
       16
       +
       

     

       17
       17
       +
           result = toString (lib.attrValues config.loaOfInt);

     

       18
       18
       +
         };

     

       19
       19
       +
       }

+20 -9

lib/types.nix

···

       280
       280
        
           # List or attribute set of ...

     

       281
       281
        
           loaOf = elemType:

     

       282
       282
        
             let

     

       283
       283
       -
               convertIfList = defIdx: def:

     

       283
       283
       +
               convertAllLists = defs:

     

       284
       284
       +
                 let

     

       285
       285
       +
                   padWidth = stringLength (toString (length defs));

     

       286
       286
       +
                   unnamedPrefix = i: "unnamed-" + fixedWidthNumber padWidth i + ".";

     

       287
       287
       +
                 in

     

       288
       288
       +
                   imap1 (i: convertIfList (unnamedPrefix i)) defs;

     

       289
       289
       +
       

     

       290
       290
       +
               convertIfList = unnamedPrefix: def:

     

       284
       291
        
                 if isList def.value then

     

       285
       285
       -
                   { inherit (def) file;

     

       286
       286
       -
                     value = listToAttrs (

     

       287
       287
       -
                       imap1 (elemIdx: elem:

     

       288
       288
       -
                         { name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}";

     

       289
       289
       -
                           value = elem;

     

       290
       290
       -
                         }) def.value);

     

       291
       291
       -
                   }

     

       292
       292
       +
                   let

     

       293
       293
       +
                     padWidth = stringLength (toString (length def.value));

     

       294
       294
       +
                     unnamed = i: unnamedPrefix + fixedWidthNumber padWidth i;

     

       295
       295
       +
                   in

     

       296
       296
       +
                     { inherit (def) file;

     

       297
       297
       +
                       value = listToAttrs (

     

       298
       298
       +
                         imap1 (elemIdx: elem:

     

       299
       299
       +
                           { name = elem.name or (unnamed elemIdx);

     

       300
       300
       +
                             value = elem;

     

       301
       301
       +
                           }) def.value);

     

       302
       302
       +
                     }

     

       292
       303
        
                 else

     

       293
       304
        
                   def;

     

       294
       305
        
               listOnly = listOf elemType;

     
···

       297
       308
        
               name = "loaOf";

     

       298
       309
        
               description = "list or attribute set of ${elemType.description}s";

     

       299
       310
        
               check = x: isList x || isAttrs x;

     

       300
       300
       -
               merge = loc: defs: attrOnly.merge loc (imap1 convertIfList defs);

     

       311
       311
       +
               merge = loc: defs: attrOnly.merge loc (convertAllLists defs);

     

       301
       312
        
               getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name?>"]);

     

       302
       313
        
               getSubModules = elemType.getSubModules;

     

       303
       314
        
               substSubModules = m: loaOf (elemType.substSubModules m);