colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Remove obsolete references to kernelPackages in Nixpkgs.

Browse Source 
svn path=/nixos/trunk/; revision=20647
This commit is contained in:
Eelco Dolstra 2010-03-16 12:10:06 +00:00
parent 5b5aefa030
commit c1e313b5e1
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/installer/cd-dvd/installation-cd-rescue.nix
View File

@ -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"];

9
modules/system/boot/kernel.nix
View File

@ -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

7
release.nix
View File

@ -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";

3
tests/installer.nix
View File

@ -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" ];