From e8e19bbb1faa8cf5201244bc0a1ade0bb111faa3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Jul 2012 01:01:48 +0200
Subject: [PATCH] modules/services/web-servers/apache-httpd: rename
 'apacheHttpd' option to 'package'

---
 modules/services/web-servers/apache-httpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 7cdbf49763a..cbd245df432 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -6,7 +6,7 @@ let
 
   mainCfg = config.services.httpd;
 
-  httpd = mainCfg.apacheHttpd;
+  httpd = mainCfg.package;
 
   httpdConf = mainCfg.configFile;
 
@@ -405,7 +405,7 @@ in
         ";
       };
 
-      apacheHttpd = mkOption {
+      package = mkOption {
         default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; };
 	example = "pkgs.apacheHttpd_2_4";
         description = "