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

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

Browse Source 
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
This commit is contained in:
Lluís Batlle i Rossell 2010-01-14 19:50:49 +00:00
parent f89e46bc12
commit 13ee735395
2 changed files with 4 additions and 2 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,7 +33,8 @@
lsof 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" boot.initrd.kernelModules = ["evdev" "i8042" "pcips2" "serio"
"sd_mod" "libata" "unix" "usbhid" "uhci_hcd" "atkbd" "xtkbd" "fbdev" "sd_mod" "libata" "unix" "usbhid" "uhci_hcd" "atkbd" "xtkbd" "fbdev"
"iso9660" "udf" "loop"]; "iso9660" "udf" "loop"];

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

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