From 44fceb9c4de685b92607d7fff9097aef3f636e92 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 14 Feb 2008 13:37:09 +0000
Subject: [PATCH] svn path=/nixos/trunk/; revision=10686

---
 upstart-jobs/apache-httpd/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/upstart-jobs/apache-httpd/default.nix b/upstart-jobs/apache-httpd/default.nix
index aff915e4a2b0..b04e12c9e317 100644
--- a/upstart-jobs/apache-httpd/default.nix
+++ b/upstart-jobs/apache-httpd/default.nix
@@ -8,6 +8,8 @@ let
 
   httpd = pkgs.apacheHttpd;
 
+  inherit (pkgs.lib) addDefaultOptionValues optional concatMap concatMapStrings;
+  
 
   makeServerInfo = cfg: {
     # Canonical name must not include a trailing slash.
@@ -21,7 +23,7 @@ let
 
   callSubservices = serverInfo: defs:
     let f = svc:
-      let config = pkgs.lib.addDefaultOptionValues res.options svc.config;
+      let config = addDefaultOptionValues res.options svc.config;
           res = svc.function {inherit config pkgs serverInfo;};
       in res;
     in map f defs;
@@ -52,7 +54,7 @@ let
       "mime" "dav" "status" "autoindex" "asis" "info" "cgi" "dav_fs"
       "vhost_alias" "negotiation" "dir" "imagemap" "actions" "speling"
       "userdir" "alias" "rewrite"
-    ] ++ pkgs.lib.optional cfg.enableSSL "ssl_module";
+    ] ++ optional cfg.enableSSL "ssl_module";
     
 
   loggingConf = ''
@@ -208,9 +210,9 @@ let
     ${let
         load = {name, path}: "LoadModule ${name}_module ${path}\n";
         allModules =
-          pkgs.lib.concatMap (svc: svc.extraModulesPre) allSubservices ++
+          concatMap (svc: svc.extraModulesPre) allSubservices ++
           map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules ++
-          pkgs.lib.concatMap (svc: svc.extraModules) allSubservices;
+          concatMap (svc: svc.extraModules) allSubservices;
       in concatMapStrings load allModules
     }
 
@@ -287,7 +289,7 @@ let
         makeVirtualHost = vhostIn:
           let
             # Fill in defaults for missing options.
-            vhost = pkgs.lib.addDefaultOptionValues perServerOptions vhostIn;
+            vhost = addDefaultOptionValues perServerOptions vhostIn;
           in ''
             <VirtualHost *:*>
                 ${perServerConf false vhost}
@@ -314,7 +316,7 @@ in
     }
   ];
 
-  extraPath = [httpd] ++ pkgs.lib.concatMap (svc: svc.extraPath) allSubservices;
+  extraPath = [httpd] ++ concatMap (svc: svc.extraPath) allSubservices;
 
   # Statically verify the syntactic correctness of the generated
   # httpd.conf.
@@ -344,7 +346,7 @@ in
 
     ${
       let f = {name, value}: "env ${name}=${value}\n";
-      in pkgs.lib.concatStrings (map f (pkgs.lib.concatMap (svc: svc.globalEnvVars) allSubservices))
+      in concatMapStrings f (pkgs.lib.concatMap (svc: svc.globalEnvVars) allSubservices)
     }
 
     env PATH=${pkgs.coreutils}/bin:${pkgs.gnugrep}/bin:${pkgs.lib.concatStringsSep ":" (pkgs.lib.concatMap (svc: svc.extraServerPath) allSubservices)}