From 2e34baba3b69cfff7143eb444ea57cd7f08296b5 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 7 Oct 2009 17:14:25 +0000
Subject: [PATCH] Rename environment.extraPackages to
 environment.systemPackages.

svn path=/nixos/trunk/; revision=17705
---
 modules/installer/grub/grub.nix                | 2 +-
 modules/installer/tools/nixos-checkout.nix     | 2 +-
 modules/programs/ssmtp.nix                     | 2 +-
 modules/services/audio/pulseaudio.nix          | 2 +-
 modules/services/monitoring/nagios/default.nix | 2 +-
 modules/services/networking/avahi-daemon.nix   | 2 +-
 modules/services/scheduling/cron.nix           | 2 +-
 modules/services/scheduling/fcron.nix          | 2 +-
 tests/remote-install-scripts/install-script.sh | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/installer/grub/grub.nix b/modules/installer/grub/grub.nix
index 1bfdda027b29..afeb947a2630 100644
--- a/modules/installer/grub/grub.nix
+++ b/modules/installer/grub/grub.nix
@@ -125,7 +125,7 @@ in
     system.boot.loader.id = "grub";
     system.boot.loader.kernelFile = "vmlinuz";
     
-    environment.extraPackages = mkIf config.boot.loader.grub.enable [ pkgs.grub ];
+    environment.systemPackages = mkIf config.boot.loader.grub.enable [ pkgs.grub ];
     
     # and many other things that have to be moved inside this file.
     
diff --git a/modules/installer/tools/nixos-checkout.nix b/modules/installer/tools/nixos-checkout.nix
index 2d59f6718844..313e8dea7a08 100644
--- a/modules/installer/tools/nixos-checkout.nix
+++ b/modules/installer/tools/nixos-checkout.nix
@@ -160,5 +160,5 @@ in
 {
   require = options;
 
-  environment.extraPackages = [nixosCheckout];
+  environment.systemPackages = [nixosCheckout];
 }
diff --git a/modules/programs/ssmtp.nix b/modules/programs/ssmtp.nix
index a0ecf763528e..2859f70e6aa2 100644
--- a/modules/programs/ssmtp.nix
+++ b/modules/programs/ssmtp.nix
@@ -87,5 +87,5 @@ mkIf cfg.directDelivery {
       }
     ];
 
-  environment.extraPackages = [pkgs.ssmtp];
+  environment.systemPackages = [pkgs.ssmtp];
 }
diff --git a/modules/services/audio/pulseaudio.nix b/modules/services/audio/pulseaudio.nix
index a63b58ca538f..7b71571337fa 100644
--- a/modules/services/audio/pulseaudio.nix
+++ b/modules/services/audio/pulseaudio.nix
@@ -43,7 +43,7 @@ mkIf config.services.pulseaudio.enable {
   ];
 
   environment = {
-    extraPackages = [pkgs.pulseaudio];
+    systemPackages = [pkgs.pulseaudio];
   };
 
   users = {
diff --git a/modules/services/monitoring/nagios/default.nix b/modules/services/monitoring/nagios/default.nix
index 079f5f1342eb..af309f5043cf 100644
--- a/modules/services/monitoring/nagios/default.nix
+++ b/modules/services/monitoring/nagios/default.nix
@@ -192,7 +192,7 @@ mkIf cfg.enable {
       }
     ];
 
-    extraPackages = [pkgs.nagios];
+    systemPackages = [pkgs.nagios];
   };
 
   users = {
diff --git a/modules/services/networking/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix
index 8437a9afc274..ff01a755f6aa 100644
--- a/modules/services/networking/avahi-daemon.nix
+++ b/modules/services/networking/avahi-daemon.nix
@@ -140,7 +140,7 @@ mkIf cfg.enable {
   };
 
   environment = {
-    extraPackages = [avahi];
+    systemPackages = [avahi];
   };
 
   users = {
diff --git a/modules/services/scheduling/cron.nix b/modules/services/scheduling/cron.nix
index a3a19e03ad08..2b4dcc825c59 100644
--- a/modules/services/scheduling/cron.nix
+++ b/modules/services/scheduling/cron.nix
@@ -70,7 +70,7 @@ in
       }
     ];
 
-    extraPackages = [pkgs.cron];
+    systemPackages = [pkgs.cron];
   };
 
   services = {
diff --git a/modules/services/scheduling/fcron.nix b/modules/services/scheduling/fcron.nix
index e4b08b632826..2764f8fdad0a 100644
--- a/modules/services/scheduling/fcron.nix
+++ b/modules/services/scheduling/fcron.nix
@@ -107,7 +107,7 @@ in
       }
     ];
 
-    extraPackages = ifEnabled [pkgs.fcron];
+    systemPackages = ifEnabled [pkgs.fcron];
   };
 
   services = {
diff --git a/tests/remote-install-scripts/install-script.sh b/tests/remote-install-scripts/install-script.sh
index 574cdb40a22e..8bcadaaba562 100755
--- a/tests/remote-install-scripts/install-script.sh
+++ b/tests/remote-install-scripts/install-script.sh
@@ -67,7 +67,7 @@ cat > /mnt/etc/nixos/configuration.nix <<EOF
   };
 
   environment = {
-    extraPackages = [
+    systemPackages = [
       pkgs.socat (pkgs.lowPrio pkgs.nixUnstable)
     ];
     nix = pkgs.nixCustomFun (pkgs.nixUnstable.src)