Merging from trunk. I had to give away some structure to build the native

sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045

3 files changed, 0 insertions, 89 deletions

diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.23.16.nix b/pkgs/os-specific/linux/kernel-headers/2.6.23.16.nix
deleted file mode 100644
index 255edade14a3..000000000000
--- a/pkgs/os-specific/linux/kernel-headers/2.6.23.16.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{stdenv, fetchurl}:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation {
-  name = "linux-headers-2.6.23.16";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.23.16.tar.bz2";
-    sha256 = "0drk3981rl5j16s6amb63lai9kpi0vf0kr6avhpd9nikj27bsa83";
-  };
-
-  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/2.6.26.2.nix b/pkgs/os-specific/linux/kernel-headers/2.6.26.2.nix
deleted file mode 100644
index 6f0c01e6ee51..000000000000
--- a/pkgs/os-specific/linux/kernel-headers/2.6.26.2.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{stdenv, fetchurl}:
-
-assert stdenv.isLinux;
-
-let version = "2.6.26.2"; in 
-
-stdenv.mkDerivation {
-  name = "linux-headers-${version}";
-  
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
-    sha256 = "0xrkv6wk5l4qhza35a76cd00a7g9xv3ymw7znwskig2kmqswnp1m";
-  };
-
-  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";
-
-  # !!! hacky
-  fixupPhase = "ln -s $out/include/asm $out/include/asm-$platform";
-
-  extraIncludeDirs =
-    if stdenv.system == "powerpc-linux" then ["ppc"] else [];
-
-  patchPhase = ''
-    sed -i '/scsi/d' include/Kbuild
-  '';
-
-  buildPhase = ''
-    make mrproper headers_check
-  '';
-
-  installPhase = ''
-    make INSTALL_HDR_PATH=$out headers_install
-
-    # Some builds (e.g. KVM) want a kernel.release.
-    ensureDir $out/include/config
-    echo "${version}-default" > $out/include/config/kernel.release
-  '';
-}
diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.27.8.nix b/pkgs/os-specific/linux/kernel-headers/2.6.27.8.nix
deleted file mode 100644
index b585c462a28f..000000000000
--- a/pkgs/os-specific/linux/kernel-headers/2.6.27.8.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{stdenv, fetchurl}:
-
-assert stdenv.isLinux;
-
-stdenv.mkDerivation {
-  name = "linux-headers-2.6.27.8";
-  
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.27.8.tar.bz2";
-    sha256 = "0pgh2zg4md9jvv64s03m3dkwdnliygjl7mxjmg1qki89jc2s62ik";
-  };
-
-  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";
-
-  # !!! hacky
-  fixupPhase = "ln -s $out/include/asm $out/include/asm-$platform";
-
-  extraIncludeDirs =
-    if stdenv.system == "powerpc-linux" then ["ppc"] else [];
-}