commit c9dad37f01d138e74d0e72050db6eb6f7d074948 · pyrox.dev/nixpkgs

-26

lib/options.nix

···

       30
       30
        
           type = lib.types.bool;

     

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
       -
         # !!! This function will be removed because this can be done with the

     

       34
       34
       -
         # multiple option declarations.

     

       35
       35
       -
         addDefaultOptionValues = defs: opts: opts //

     

       36
       36
       -
           builtins.listToAttrs (map (defName:

     

       37
       37
       -
             { name = defName;

     

       38
       38
       -
               value =

     

       39
       39
       -
                 let

     

       40
       40
       -
                   defValue = builtins.getAttr defName defs;

     

       41
       41
       -
                   optValue = builtins.getAttr defName opts;

     

       42
       42
       -
                 in

     

       43
       43
       -
                 if isOption defValue

     

       44
       44
       -
                 then

     

       45
       45
       -
                   # `defValue' is an option.

     

       46
       46
       -
                   if hasAttr defName opts

     

       47
       47
       -
                   then builtins.getAttr defName opts

     

       48
       48
       -
                   else defValue.default

     

       49
       49
       -
                 else

     

       50
       50
       -
                   # `defValue' is an attribute set containing options.

     

       51
       51
       -
                   # So recurse.

     

       52
       52
       -
                   if hasAttr defName opts && isAttrs optValue

     

       53
       53
       -
                   then addDefaultOptionValues defValue optValue

     

       54
       54
       -
                   else addDefaultOptionValues defValue {};

     

       55
       55
       -
             }

     

       56
       56
       -
           ) (attrNames defs));

     

       57
       57
       -
       

     

       58
       33
        
         mergeDefaultOption = args: list:

     

       59
       34
        
           if length list == 1 then head list

     

       60
       35
        
           else if all builtins.isFunction list then x: mergeDefaultOption args (map (f: f x) list)

     
···

       64
       39
        
           else if all builtins.isString list then lib.concatStrings list

     

       65
       40
        
           else if all builtins.isInt list && all (x: x == head list) list then head list

     

       66
       41
        
           else throw "Cannot merge definitions of `${showOption args.prefix}' given in ${showFiles args.files}.";

     

       67
       67
       -
       

     

       68
       42
        
       

     

       69
       43
        
         /* Obsolete, will remove soon.  Specify an option type or apply

     

       70
       44
        
            function instead.  */

+4 -2

nixos/modules/services/web-servers/apache-httpd/default.nix

···

       47
       47
        
               svcFunction =

     

       48
       48
        
                 if svc ? function then svc.function

     

       49
       49
        
                 else import "${./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix";

     

       50
       50
       -
               config = addDefaultOptionValues res.options

     

       51
       51
       -
                 (if svc ? config then svc.config else svc);

     

       50
       50
       +
               config = (evalModules

     

       51
       51
       +
                 { modules = [ { options = res.options; config = svc.config or svc; } ];

     

       52
       52
       +
                   check = false;

     

       53
       53
       +
                 }).config;

     

       52
       54
        
               defaults = {

     

       53
       55
        
                 extraConfig = "";

     

       54
       56
        
                 extraModules = [];