* Remove old kernel headers, use 2.6.18.1.

svn path=/nixpkgs/trunk/; revision=6832

pkgs/os-specific/linux/kernel-headers/default.nix

@@ -1 +1,12 @@
-import ./kernel-headers-2.6.17.11.nix
+{stdenv, fetchurl}:
+
+assert stdenv.isLinux;
+
+stdenv.mkDerivation {
+  name = "linux-headers-2.6.18.1";
+  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";
+  };
+}

pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.14.3.nix

@@ -1,12 +0,0 @@
-{stdenv, fetchurl}:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation {
-  name = "linux-headers-2.6.14.3";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/linux-2.6.14.3.tar.bz2;
-    md5 = "982717a9cb246e3c427cc45e3fc86097";
-  };
-}

pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.11.nix

@@ -1,12 +0,0 @@
-{stdenv, fetchurl}:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation {
-  name = "linux-headers-2.6.17.11";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/linux-2.6.17.11.tar.bz2;
-    md5 = "2958a620129c442a8ba3a665ea34ca8b";
-  };
-}

pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.18.1.nix

@@ -1,12 +0,0 @@
-{stdenv, fetchurl}:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation {
-  name = "linux-headers-2.6.18.1";
-  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";
-  };
-}

pkgs/top-level/all-packages.nix

@@ -2070,10 +2070,6 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  kernelHeadersNew = import ../os-specific/linux/kernel-headers/kernel-headers-2.6.18.1.nix {
-    inherit fetchurl stdenv;
-  };
-
   kernelHeadersArm = import ../os-specific/linux/kernel-headers-cross {
     inherit fetchurl stdenv;
     cross = "arm-linux";