diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:09:16 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-28 22:45:58 +0100 |
| commit | c9dad37f01d138e74d0e72050db6eb6f7d074948 (patch) | |
| tree | 2c6a45601b2d638d721f1f0551310296922a97c5 /nixos/modules/services | |
| parent | f8a9eb9f00ae84bc2daef9b78d2bd5153ffe81b6 (diff) | |
| download | nixpkgs-c9dad37f01d138e74d0e72050db6eb6f7d074948.tar nixpkgs-c9dad37f01d138e74d0e72050db6eb6f7d074948.tar.gz nixpkgs-c9dad37f01d138e74d0e72050db6eb6f7d074948.tar.bz2 nixpkgs-c9dad37f01d138e74d0e72050db6eb6f7d074948.tar.lz nixpkgs-c9dad37f01d138e74d0e72050db6eb6f7d074948.tar.xz nixpkgs-c9dad37f01d138e74d0e72050db6eb6f7d074948.tar.zst nixpkgs-c9dad37f01d138e74d0e72050db6eb6f7d074948.zip | |
Remove obsolete function addDefaultOptionValues
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 7688b04f1c1..4b0a5d6d363 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -47,8 +47,10 @@ let svcFunction = if svc ? function then svc.function else import "${./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix"; - config = addDefaultOptionValues res.options - (if svc ? config then svc.config else svc); + config = (evalModules + { modules = [ { options = res.options; config = svc.config or svc; } ]; + check = false; + }).config; defaults = { extraConfig = ""; extraModules = []; |