Option "kde.extraPackages" is now deprecated.

svn path=/nixos/trunk/; revision=17682

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.

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;
       };
 
     };