Making nixos work well with the new names 'linuxPackages' in stdenv-updates, additionally

to the nixpkgs trunk 'kernelPackages'.
Seeing a strange kernelPackages mentioned in installation-cd-rescue (2.6.31_something) I
update that to 2.6.32.


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

modules/installer/cd-dvd/installation-cd-rescue.nix

@@ -33,7 +33,8 @@
     lsof
   ];
 
-  boot.kernelPackages = pkgs.kernelPackages_2_6_31_rc4_old_i686;
+  boot.kernelPackages = (if (nixpkgs ? linuxlPackages then
+    pkgs.linuxPackages_2_6_32 else pkgs.kernelPackages_2_6_32);
   boot.initrd.kernelModules = ["evdev" "i8042" "pcips2" "serio"
     "sd_mod" "libata" "unix" "usbhid" "uhci_hcd" "atkbd" "xtkbd" "fbdev"
     "iso9660" "udf" "loop"];

modules/system/boot/kernel.nix

@@ -11,7 +11,8 @@ let kernel = config.boot.kernelPackages.kernel; in
   options = {
   
     boot.kernelPackages = mkOption {
-      default = pkgs.kernelPackages;
+      default = (if pkgs ? linuxPackages then pkgs.linuxPackages
+        else pkgs.kernelPackages);
       example = ''
         Example code (copy & paste):
         pkgs.kernelPackages_2_6_25