···

       
200
       
200
       
 
       
  /* Massage a module into canonical form, that is, a set consisting

     

       
201
       
201
       
 
       
     of ‘options’, ‘config’ and ‘imports’ attributes. */

     

       
202
       
202
       
 
       
  unifyModuleSyntax = file: key: m:

     

       
203
       
203
       
-
       
    let addMeta = config: if m ? meta

     

       
204
       
204
       
-
       
      then mkMerge [ config { meta = m.meta; } ]

     

       
205
       
205
       
-
       
      else config;

     

       
203
       
203
       
+
       
    let

     

       
204
       
204
       
+
       
      addMeta = config: if m ? meta

     

       
205
       
205
       
+
       
        then mkMerge [ config { meta = m.meta; } ]

     

       
206
       
206
       
+
       
        else config;

     

       
207
       
207
       
+
       
      addFreeformType = config: if m ? freeformType

     

       
208
       
208
       
+
       
        then mkMerge [ config { _module.freeformType = m.freeformType; } ]

     

       
209
       
209
       
+
       
        else config;

     

       
206
       
210
       
 
       
    in

     

       
207
       
211
       
 
       
    if m ? config || m ? options then

     

       
208
       
208
       
-
       
      let badAttrs = removeAttrs m ["_file" "key" "disabledModules" "imports" "options" "config" "meta"]; in

     

       
212
       
212
       
+
       
      let badAttrs = removeAttrs m ["_file" "key" "disabledModules" "imports" "options" "config" "meta" "freeformType"]; in

     

       
209
       
213
       
 
       
      if badAttrs != {} then

     

       
210
       
214
       
 
       
        throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by introducing a top-level `config' or `options' attribute. Add configuration attributes immediately on the top level instead, or move all of them (namely: ${toString (attrNames badAttrs)}) into the explicit `config' attribute."

     

       
211
       
215
       
 
       
      else

     
···

       
214
       
218
       
 
       
          disabledModules = m.disabledModules or [];

     

       
215
       
219
       
 
       
          imports = m.imports or [];

     

       
216
       
220
       
 
       
          options = m.options or {};

     

       
217
       
217
       
-
       
          config = addMeta (m.config or {});

     

       
221
       
221
       
+
       
          config = addFreeformType (addMeta (m.config or {}));

     

       
218
       
222
       
 
       
        }

     

       
219
       
223
       
 
       
    else

     

       
220
       
224
       
 
       
      { _file = m._file or file;

     
···

       
222
       
226
       
 
       
        disabledModules = m.disabledModules or [];

     

       
223
       
227
       
 
       
        imports = m.require or [] ++ m.imports or [];

     

       
224
       
228
       
 
       
        options = {};

     

       
225
       
225
       
-
       
        config = addMeta (removeAttrs m ["_file" "key" "disabledModules" "require" "imports"]);

     

       
229
       
229
       
+
       
        config = addFreeformType (addMeta (removeAttrs m ["_file" "key" "disabledModules" "require" "imports" "freeformType"]));

     

       
226
       
230
       
 
       
      };

     

       
227
       
231
       
 
       


     

       
228
       
232
       
 
       
  applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then

     

···

       
1
       
1
       
 
       
{ lib, ... }: {

     

       
2
       
2
       
-
       
  config._module.freeformType = with lib.types; attrsOf (either str (attrsOf str));

     

       
2
       
2
       
+
       
  freeformType = with lib.types; attrsOf (either str (attrsOf str));

     

       
3
       
3
       
 
       
}

     

···

       
1
       
1
       
 
       
{ lib, ... }: {

     

       
2
       
2
       
-
       
  config._module.freeformType = with lib.types; lazyAttrsOf (either str (lazyAttrsOf str));

     

       
2
       
2
       
+
       
  freeformType = with lib.types; lazyAttrsOf (either str (lazyAttrsOf str));

     

       
3
       
3
       
 
       
}