Rename environment.extraPackages to environment.systemPackages.

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

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.
     

modules/installer/tools/nixos-checkout.nix

@@ -160,5 +160,5 @@ in
 {
   require = options;
 
-  environment.extraPackages = [nixosCheckout];
+  environment.systemPackages = [nixosCheckout];
 }

modules/programs/ssmtp.nix

@@ -87,5 +87,5 @@ mkIf cfg.directDelivery {
       }
     ];
 
-  environment.extraPackages = [pkgs.ssmtp];
+  environment.systemPackages = [pkgs.ssmtp];
 }

modules/services/audio/pulseaudio.nix

@@ -43,7 +43,7 @@ mkIf config.services.pulseaudio.enable {
   ];
 
   environment = {
-    extraPackages = [pkgs.pulseaudio];
+    systemPackages = [pkgs.pulseaudio];
   };
 
   users = {

modules/services/monitoring/nagios/default.nix

@@ -192,7 +192,7 @@ mkIf cfg.enable {
       }
     ];
 
-    extraPackages = [pkgs.nagios];
+    systemPackages = [pkgs.nagios];
   };
 
   users = {

modules/services/networking/avahi-daemon.nix

@@ -140,7 +140,7 @@ mkIf cfg.enable {
   };
 
   environment = {
-    extraPackages = [avahi];
+    systemPackages = [avahi];
   };
 
   users = {

modules/services/scheduling/cron.nix

@@ -70,7 +70,7 @@ in
       }
     ];
 
-    extraPackages = [pkgs.cron];
+    systemPackages = [pkgs.cron];
   };
 
   services = {

modules/services/scheduling/fcron.nix

@@ -107,7 +107,7 @@ in
       }
     ];
 
-    extraPackages = ifEnabled [pkgs.fcron];
+    systemPackages = ifEnabled [pkgs.fcron];
   };
 
   services = {

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)