From c1e313b5e1737018a46f903772eabf2e7fa49666 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Mar 2010 12:10:06 +0000
Subject: [PATCH] * Remove obsolete references to kernelPackages in Nixpkgs.

svn path=/nixos/trunk/; revision=20647
---
 modules/installer/cd-dvd/installation-cd-rescue.nix | 3 +--
 modules/system/boot/kernel.nix                      | 9 ++-------
 release.nix                                         | 7 -------
 tests/installer.nix                                 | 3 +--
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/modules/installer/cd-dvd/installation-cd-rescue.nix b/modules/installer/cd-dvd/installation-cd-rescue.nix
index 9db626e5a9dd..7b220680b6c3 100644
--- a/modules/installer/cd-dvd/installation-cd-rescue.nix
+++ b/modules/installer/cd-dvd/installation-cd-rescue.nix
@@ -33,8 +33,7 @@
     lsof
   ];
 
-  boot.kernelPackages = (if (nixpkgs ? linuxlPackages then
-    pkgs.linuxPackages_2_6_32 else pkgs.kernelPackages_2_6_32);
+  boot.kernelPackages = pkgs.linuxPackages_2_6_32;
   boot.initrd.kernelModules = ["evdev" "i8042" "pcips2" "serio"
     "sd_mod" "libata" "unix" "usbhid" "uhci_hcd" "atkbd" "xtkbd" "fbdev"
     "iso9660" "udf" "loop"];
diff --git a/modules/system/boot/kernel.nix b/modules/system/boot/kernel.nix
index 66b83107ec29..99941c63a70f 100644
--- a/modules/system/boot/kernel.nix
+++ b/modules/system/boot/kernel.nix
@@ -11,13 +11,8 @@ let kernel = config.boot.kernelPackages.kernel; in
   options = {
   
     boot.kernelPackages = mkOption {
-      default = (if pkgs ? linuxPackages then pkgs.linuxPackages
-        else pkgs.kernelPackages);
-      example = ''
-        Example code (copy & paste):
-        pkgs.kernelPackages_2_6_25
-      '';
-
+      default = pkgs.linuxPackages;
+      example = "pkgs.linuxPackages_2_6_25";
       description = ''
         This option allows you to override the Linux kernel used by
         NixOS.  Since things like external kernel module packages are
diff --git a/release.nix b/release.nix
index a0144cc7536c..2441ff2952ae 100644
--- a/release.nix
+++ b/release.nix
@@ -123,13 +123,6 @@ let
       description = "minimal";
     };
 
-    /*    
-    iso_rescue = makeIso {
-      module = ./modules/installer/cd-dvd/installation-cd-rescue.nix;
-      description = "rescue";
-    };
-    */
-    
     iso_graphical = makeIso {
       module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
       description = "graphical";
diff --git a/tests/installer.nix b/tests/installer.nix
index 657846ae074e..10ac14332b0d 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -78,8 +78,7 @@ let
       # Make the Nix store in this VM writable using AUFS.  Use Linux
       # 2.6.27 because 2.6.32 doesn't work (probably we need AUFS2).
       # This should probably be moved to qemu-vm.nix.
-      boot.kernelPackages = (if pkgs ? linuxPackages then
-        pkgs.linuxPackages_2_6_27 else pkgs.kernelPackages_2_6_27);
+      boot.kernelPackages = pkgs.linuxPackages_2_6_27;
       boot.extraModulePackages = [ config.boot.kernelPackages.aufs ];
       boot.initrd.availableKernelModules = [ "aufs" ];