diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-05-31 11:23:47 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-05-31 11:23:47 +0000 |
| commit | e9ed8e88008155a5651efe61b764917c4e5069de (patch) | |
| tree | d4f869adb99f92a1ca5f66380e787104005b4985 | |
| parent | bcdeab39662dedd61eee1ebbcf63038ac414fd44 (diff) | |
| download | nixlib-e9ed8e88008155a5651efe61b764917c4e5069de.tar nixlib-e9ed8e88008155a5651efe61b764917c4e5069de.tar.gz nixlib-e9ed8e88008155a5651efe61b764917c4e5069de.tar.bz2 nixlib-e9ed8e88008155a5651efe61b764917c4e5069de.tar.lz nixlib-e9ed8e88008155a5651efe61b764917c4e5069de.tar.xz nixlib-e9ed8e88008155a5651efe61b764917c4e5069de.tar.zst nixlib-e9ed8e88008155a5651efe61b764917c4e5069de.zip | |
* Apply the paravirt-nvidia through the kernelPatches argument.
* Kernel 2.6.20.12. svn path=/nixpkgs/trunk/; revision=8808
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-2.6.20.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.20.nix b/pkgs/os-specific/linux/kernel/linux-2.6.20.nix index ab9acf26d96c..9452846b985e 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.20.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.20.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ca96dbdd7f3..07d0fcc00663 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |