From 9b5611e35e5edccb10199ad91de2bbb140aad2c8 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue, 6 Oct 2009 19:25:25 +0000
Subject: [PATCH] Option "kde.extraPackages" is now deprecated.

svn path=/nixos/trunk/; revision=17682
---
 modules/rename.nix                                |  5 +++++
 .../x11/desktop-managers/kde-environment.nix      | 15 ---------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/modules/rename.nix b/modules/rename.nix
index fcbdb9b3b02c..05d278bd3e7f 100644
--- a/modules/rename.nix
+++ b/modules/rename.nix
@@ -71,6 +71,11 @@ in zipModules ([]
 ++ rename obsolete "boot.bootMount" to "boot.loader.grub.bootDevice"
 ++ rename obsolete "boot.grubSplashImage" to "boot.loader.grub.splashImage"
 
+# jobs
 ++ rename obsolete "services.extraJobs" to "jobs"
 
+# kde
+++ rename deprecated "kde.extraPackages" to "environment.kdePackages"
+
+
 ) # do not add renaming after this.
diff --git a/modules/services/x11/desktop-managers/kde-environment.nix b/modules/services/x11/desktop-managers/kde-environment.nix
index 6053832a3c3d..98b92e42b851 100644
--- a/modules/services/x11/desktop-managers/kde-environment.nix
+++ b/modules/services/x11/desktop-managers/kde-environment.nix
@@ -6,20 +6,6 @@ let
 
   options = {
 
-    kde = {
-
-      extraPackages = mkOption {
-        default = [];
-        merge = builtins.trace "!!! kde.extraPackages is obsolete, you should use environment.kdePackages." pkgs.lib.mergeDefaultOption;
-        description = ''
-          ** Obsolete **
-          Additional KDE packages to be used when you use KDE as a desktop
-          manager.  By default, you only get the KDE base packages.
-        '';
-      };
-
-    };
-
     environment = {
 
       kdePackages = mkOption {
@@ -30,7 +16,6 @@ let
           Additional KDE packages to be used when you use KDE as a desktop
           manager.  By default, you only get the KDE base packages.
         '';
-        apply = pkgs: pkgs ++ config.kde.extraPackages;
       };
 
     };