From 8d3160f8b0b553fe06bcfe34a04f54b7dadd4019 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 May 2007 16:16:43 +0000
Subject: [PATCH] * Use the 2.6.20 kernel headers.

svn path=/nixpkgs/trunk/; revision=8769
---
 .../linux/kernel-headers/2.6.20.nix           | 21 -------------------
 .../linux/kernel-headers/default.nix          |  6 +++---
 pkgs/top-level/all-packages.nix               |  6 +-----
 3 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel-headers/2.6.20.nix

diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.20.nix b/pkgs/os-specific/linux/kernel-headers/2.6.20.nix
deleted file mode 100644
index 3676ece7825c..000000000000
--- a/pkgs/os-specific/linux/kernel-headers/2.6.20.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{stdenv, fetchurl}:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation {
-  name = "linux-headers-2.6.20";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2;
-    sha256 = "0n455dyvmbs9l0m3hll2rilyrj8gsqqablrhnh1jw9vxmjhss51c";
-  };
-
-  platform = 
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    if stdenv.system == "powerpc-linux" then "powerpc" else
-    abort "don't know what the kernel include directory is called for this platform";
-
-  extraIncludeDirs =
-    if stdenv.system == "powerpc-linux" then ["ppc"] else [];
-}
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index baa225f50513..9aa9f9ba488d 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "linux-headers-2.6.18.1";
+  name = "linux-headers-2.6.20.11";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.1.tar.bz2;
-    md5 = "38f00633b02f07819d17bcd87d03eb3a";
+    url = "http://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.11.tar.bz2";
+    sha256 = "1n0xgqckj64ga3l53l8lk1591lfcn6zcrqg3phz2m0y841ck5qlk";
   };
 
   platform = 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e16c9d01a52..2aa0952ea474 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2239,10 +2239,6 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  kernelHeaders_2_6_20 = import ../os-specific/linux/kernel-headers/2.6.20.nix {
-    inherit fetchurl stdenv;
-  };
-
   kernelscripts = import ../os-specific/linux/kernelscripts {
     inherit stdenv module_init_tools kernel;
     modules = [];
@@ -2289,7 +2285,7 @@ rec {
   kvm12 = import ../os-specific/linux/kvm/12.nix {
     inherit fetchurl zlib e2fsprogs SDL alsaLib;
     stdenv = overrideGCC stdenv gcc34;
-    kernelHeaders = kernelHeaders_2_6_20;
+    kernelHeaders = stdenv.gcc.libc.kernelHeaders;
   };
 
   libcap = import ../os-specific/linux/libcap {