movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 12:45:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove obsolete function addDefaultOptionValues

Browse source
This commit is contained in:
Eelco Dolstra 2013-10-28 22:09:16 +01:00
parent f8a9eb9f00
commit c9dad37f01
2 changed files with 4 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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 = [];