commit 8e00dcd242f33fa34c8dba3bad2854cbb6bd0659 · pyrox.dev/nixpkgs

+9 -5

lib/generators.nix

···

       22
       22
        
          * character sep. If sep appears in k, it is escaped.

     

       23
       23
        
          * Helper for synaxes with different separators.

     

       24
       24
        
          *

     

       25
       25
       -
          * mkKeyValueDefault ":" "f:oo" "bar"

     

       25
       25
       +
          * mkValueString specifies how values should be formatted.

     

       26
       26
       +
          *

     

       27
       27
       +
          * mkKeyValueDefault {} ":" "f:oo" "bar"

     

       26
       28
        
          * > "f\:oo:bar"

     

       27
       29
        
          */

     

       28
       28
       -
         mkKeyValueDefault = sep: k: v:

     

       29
       29
       -
           "${libStr.escape [sep] k}${sep}${toString v}";

     

       30
       30
       +
         mkKeyValueDefault = {

     

       31
       31
       +
           mkValueString ? toString

     

       32
       32
       +
         }: sep: k: v:

     

       33
       33
       +
           "${libStr.escape [sep] k}${sep}${mkValueString v}";

     

       30
       34
        
       

     

       31
       35
        
       

     

       32
       36
        
         /* Generate a key-value-style config file from an attrset.

     
···

       34
       38
        
          * mkKeyValue is the same as in toINI.

     

       35
       39
        
          */

     

       36
       40
        
         toKeyValue = {

     

       37
       37
       -
           mkKeyValue ? mkKeyValueDefault "="

     

       41
       41
       +
           mkKeyValue ? mkKeyValueDefault {} "="

     

       38
       42
        
         }: attrs:

     

       39
       43
        
           let mkLine = k: v: mkKeyValue k v + "\n";

     

       40
       44
        
           in libStr.concatStrings (libAttr.mapAttrsToList mkLine attrs);

     
···

       64
       68
        
           # apply transformations (e.g. escapes) to section names

     

       65
       69
        
           mkSectionName ? (name: libStr.escape [ "[" "]" ] name),

     

       66
       70
        
           # format a setting line from key and value

     

       67
       67
       -
           mkKeyValue    ? mkKeyValueDefault "="

     

       71
       71
       +
           mkKeyValue    ? mkKeyValueDefault {} "="

     

       68
       72
        
         }: attrsOfAttrs:

     

       69
       73
        
           let

     

       70
       74
        
               # map function to string for each key val

+1 -1

lib/tests/misc.nix

···

       201
       201
        
       # in alphabetical order

     

       202
       202
        
       

     

       203
       203
        
         testMkKeyValueDefault = {

     

       204
       204
       -
           expr = generators.mkKeyValueDefault ":" "f:oo" "bar";

     

       204
       204
       +
           expr = generators.mkKeyValueDefault {} ":" "f:oo" "bar";

     

       205
       205
        
           expected = ''f\:oo:bar'';

     

       206
       206
        
         };

     

       207
       207