From 1080560215481d402b6455b9de6bb97c14a093dd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Oct 2006 22:26:09 +0000
Subject: [PATCH] * Remove old kernel headers, use 2.6.18.1.
svn path=/nixpkgs/trunk/; revision=6832
---
pkgs/os-specific/linux/kernel-headers/default.nix | 13 ++++++++++++-
.../kernel-headers/kernel-headers-2.6.14.3.nix | 12 ------------
.../kernel-headers/kernel-headers-2.6.17.11.nix | 12 ------------
.../kernel-headers/kernel-headers-2.6.18.1.nix | 12 ------------
pkgs/top-level/all-packages.nix | 4 ----
5 files changed, 12 insertions(+), 41 deletions(-)
delete mode 100644 pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.14.3.nix
delete mode 100644 pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.11.nix
delete mode 100644 pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.18.1.nix
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index c7f6955f7f9..73311a40920 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/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";
+ };
+}
diff --git a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.14.3.nix b/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.14.3.nix
deleted file mode 100644
index f1b21e712ca..00000000000
--- a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.14.3.nix
+++ /dev/null
@@ -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";
- };
-}
diff --git a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.11.nix b/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.11.nix
deleted file mode 100644
index 5a9cde67247..00000000000
--- a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.17.11.nix
+++ /dev/null
@@ -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";
- };
-}
diff --git a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.18.1.nix b/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.18.1.nix
deleted file mode 100644
index 73311a40920..00000000000
--- a/pkgs/os-specific/linux/kernel-headers/kernel-headers-2.6.18.1.nix
+++ /dev/null
@@ -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";
- };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 919e2bd235d..2791440df54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/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";