commit 6db219730e6ab6405442e53de2b8acf3404fbdf7 · pyrox.dev/nixpkgs

+4 -1

lib/generators.nix

···

       342
       342
        
             else "{" + introSpace

     

       343
       343
        
                 + libStr.concatStringsSep introSpace (libAttr.mapAttrsToList

     

       344
       344
        
                     (name: value:

     

       345
       345
       -
                       "${libStr.escapeNixIdentifier name} = ${go (indent + "  ") value};") v)

     

       345
       345
       +
                       "${libStr.escapeNixIdentifier name} = ${

     

       346
       346
       +
                         builtins.addErrorContext "while evaluating an attribute `${name}`"

     

       347
       347
       +
                           (go (indent + "  ") value)

     

       348
       348
       +
                       };") v)

     

       346
       349
        
               + outroSpace + "}"

     

       347
       350
        
           else abort "generators.toPretty: should never happen (v = ${v})";

     

       348
       351
        
         in go "";

+14 -3

lib/options.nix

···

       221
       221
        
         optionAttrSetToDocList' = _: options:

     

       222
       222
        
           concatMap (opt:

     

       223
       223
        
             let

     

       224
       224
       +
               name = showOption opt.loc;

     

       224
       225
        
               docOption = rec {

     

       225
       226
        
                 loc = opt.loc;

     

       226
       226
       -
                 name = showOption opt.loc;

     

       227
       227
       +
                 inherit name;

     

       227
       228
        
                 description = opt.description or null;

     

       228
       229
        
                 declarations = filter (x: x != unknownModule) opt.declarations;

     

       229
       230
        
                 internal = opt.internal or false;

     
···

       234
       235
        
                 readOnly = opt.readOnly or false;

     

       235
       236
        
                 type = opt.type.description or "unspecified";

     

       236
       237
        
               }

     

       237
       237
       -
               // optionalAttrs (opt ? example) { example = renderOptionValue opt.example; }

     

       238
       238
       -
               // optionalAttrs (opt ? default) { default = renderOptionValue (opt.defaultText or opt.default); }

     

       238
       238
       +
               // optionalAttrs (opt ? example) {

     

       239
       239
       +
                 example =

     

       240
       240
       +
                   builtins.addErrorContext "while evaluating the example of option `${name}`" (

     

       241
       241
       +
                     renderOptionValue opt.example

     

       242
       242
       +
                   );

     

       243
       243
       +
               }

     

       244
       244
       +
               // optionalAttrs (opt ? default) {

     

       245
       245
       +
                 default =

     

       246
       246
       +
                   builtins.addErrorContext "while evaluating the default value of option `${name}`" (

     

       247
       247
       +
                     renderOptionValue (opt.defaultText or opt.default)

     

       248
       248
       +
                   );

     

       249
       249
       +
               }

     

       239
       250
        
               // optionalAttrs (opt ? relatedPackages && opt.relatedPackages != null) { inherit (opt) relatedPackages; };

     

       240
       251
        
       

     

       241
       252
        
               subOptions =