* Apply the paravirt-nvidia through the kernelPatches argument.

* Kernel 2.6.20.12.

svn path=/nixpkgs/trunk/; revision=8808
This commit is contained in:
Eelco Dolstra 2007-05-31 11:23:47 +00:00
parent bcdeab3966
commit e9ed8e8800
2 changed files with 7 additions and 4 deletions

View file

@ -24,7 +24,7 @@ let
lib = import ../../../lib;
version = "2.6.20.11";
version = "2.6.20.12";
in
@ -34,11 +34,11 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-${version}.tar.bz2";
sha256 = "1n0xgqckj64ga3l53l8lk1591lfcn6zcrqg3phz2m0y841ck5qlk";
sha256 = "1s7vdpg2897q5pcyxxypqcnibwpbdawbimkf3pngmahj8wr9c03x";
};
patches = [./2.6.20-paravirt-nvidia.patch] ++ (map (p: p.patch) kernelPatches);
extraConfig = lib.concatStrings (map (p: "\n" + p.extraConfig + "\n") kernelPatches);
patches = map (p: p.patch) kernelPatches;
extraConfig = lib.concatStrings (map (p: "\n" + (if p ? extraConfig then p.extraConfig else "") + "\n") kernelPatches);
config =
if kernelConfig != null then kernelConfig else

View file

@ -2279,6 +2279,9 @@ rec {
kernel_2_6_20 = import ../os-specific/linux/kernel/linux-2.6.20.nix {
inherit fetchurl stdenv perl mktemp module_init_tools;
kernelPatches = [
{ name = "paravirt-nvidia";
patch = ../os-specific/linux/kernel/2.6.20-paravirt-nvidia.patch;
}
{ name = "skas-2.6.20-v9-pre9";
patch = fetchurl {
url = http://www.user-mode-linux.org/~blaisorblade/patches/skas3-2.6/skas-2.6.20-v9-pre9/skas-2.6.20-v9-pre9.patch.bz2;