move "environment.extraPackages" into the rename module.

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

modules/config/system-path.nix

@@ -60,8 +60,7 @@ let
       pkgs.usbutils
       pkgs.utillinux
       pkgs.wirelesstools
-    ]
+    ];
-    ++ config.environment.extraPackages;
 
 
   options = {
@@ -69,6 +68,8 @@ let
     environment = {
 
       systemPackages = mkOption {
+        default = [];
+        example = [pkgs.firefox pkgs.thunderbird];
         description = ''
           The set of packages that appear in
           /var/run/current-system/sw.  These packages are
@@ -80,16 +81,6 @@ let
         '';
       };
 
-      # !!! Obsolete.
-      extraPackages = mkOption {
-        default = [];
-        example = [pkgs.firefox pkgs.thunderbird];
-        description = ''
-          This option allows you to add additional packages to the system
-          path.
-        '';
-      };
-
       pathsToLink = mkOption {
         default = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
         example = ["/"];

modules/rename.nix

@@ -34,7 +34,7 @@ in zipModules ([]
 
 # usage example:
 # ++ rename alias "services.xserver.slim.theme" to "services.xserver.displayManager.slim.theme"
-# ++ rename obsolete "environment.extraPackages" to "environment.systemPackages"
+++ rename obsolete "environment.extraPackages" to "environment.systemPackages"