From c9f5889ad18ed8dc62a25709c0cdc446993d871e Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Mon, 28 Sep 2009 18:26:18 +0000
Subject: [PATCH] move "environment.extraPackages" into the rename module.

svn path=/nixos/trunk/; revision=17485
---
 modules/config/system-path.nix | 15 +++------------
 modules/rename.nix             |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index f0da2eab341f..91a88656bf82 100644
--- a/modules/config/system-path.nix
+++ b/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 = ["/"];
diff --git a/modules/rename.nix b/modules/rename.nix
index 777b95cc9775..950321105ca7 100644
--- a/modules/rename.nix
+++ b/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"