From 2e9dc1ea47180caf35f3ddcad2e305684611a83a Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Fri, 8 Aug 2008 18:57:11 +0000
Subject: [PATCH] Rename option: services.xserver.packageFun -> .package

svn path=/nixos/trunk/; revision=12553
---
 system/options.nix       | 7 ++++++-
 upstart-jobs/xserver.nix | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/system/options.nix b/system/options.nix
index 8ef10f42f2ad..df30b8e011a2 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -1417,7 +1417,12 @@ in
 
       packageFun = mkOption {
         default = pkgs.xorg;
-        merge = backwardPkgsFunMerge;
+        merge = obsolete "option" backwardPkgsFunMerge;
+        description = "Obsolete: use 'package' instead.";
+      };
+
+      package = mkOption {
+        default = config.services.xserver.packageFun; # pkgs.xorg;
         description = "
           Alternative X.org package to use. For 
           example, you can replace individual drivers.
diff --git a/upstart-jobs/xserver.nix b/upstart-jobs/xserver.nix
index 9218c80d2b08..a528952c6b16 100644
--- a/upstart-jobs/xserver.nix
+++ b/upstart-jobs/xserver.nix
@@ -10,7 +10,7 @@ let
 
   # Abbreviations.
   cfg = config.services.xserver;
-  xorg = cfg.packageFun;
+  xorg = cfg.package;
   gnome = pkgs.gnome;
   stdenv = pkgs.stdenv;