commit 46456a929b654ed2ac9c56f8a0c1fa1823a4a2a9 · pyrox.dev/nixpkgs

+1 -1

lib/default.nix

···

       146
       146
        
             scrubOptionValue literalExpression literalExample

     

       147
       147
        
             showOption showOptionWithDefLocs showFiles

     

       148
       148
        
             unknownModule mkOption mkPackageOption mkPackageOptionMD

     

       149
       149
       -
             mdDoc literalMD;

     

       149
       149
       +
             literalMD;

     

       150
       150
        
           inherit (self.types) isType setType defaultTypeMerge defaultFunctor

     

       151
       151
        
             isOptionType mkOptionType;

     

       152
       152
        
           inherit (self.asserts)

+4 -4

lib/modules.nix

···

       136
       136
        
                   # TODO: Change the type of this option to a submodule with a

     

       137
       137
        
                   # freeformType, so that individual arguments can be documented

     

       138
       138
        
                   # separately

     

       139
       139
       -
                   description = lib.mdDoc ''

     

       139
       139
       +
                   description = ''

     

       140
       140
        
                     Additional arguments passed to each module in addition to ones

     

       141
       141
        
                     like `lib`, `config`,

     

       142
       142
        
                     and `pkgs`, `modulesPath`.

     
···

       187
       187
        
                   type = types.bool;

     

       188
       188
        
                   internal = true;

     

       189
       189
        
                   default = true;

     

       190
       190
       -
                   description = lib.mdDoc "Whether to check whether all option definitions have matching declarations.";

     

       190
       190
       +
                   description = "Whether to check whether all option definitions have matching declarations.";

     

       191
       191
        
                 };

     

       192
       192
        
       

     

       193
       193
        
                 _module.freeformType = mkOption {

     

       194
       194
        
                   type = types.nullOr types.optionType;

     

       195
       195
        
                   internal = true;

     

       196
       196
        
                   default = null;

     

       197
       197
       -
                   description = lib.mdDoc ''

     

       197
       197
       +
                   description = ''

     

       198
       198
        
                     If set, merge all definitions that don't have an associated option

     

       199
       199
        
                     together using this type. The result then gets combined with the

     

       200
       200
        
                     values of all declared options to produce the final `

     
···

       209
       209
        
                 _module.specialArgs = mkOption {

     

       210
       210
        
                   readOnly = true;

     

       211
       211
        
                   internal = true;

     

       212
       212
       -
                   description = lib.mdDoc ''

     

       212
       212
       +
                   description = ''

     

       213
       213
        
                     Externally provided module arguments that can't be modified from

     

       214
       214
        
                     within a configuration, but can be used in module imports.

     

       215
       215
        
                   '';