From 32cec049d387460ddee698ce3fe13ea237ce8c13 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 13 Jan 2010 15:46:38 +0000
Subject: [PATCH] Update Zen kernel set

svn path=/nixpkgs/trunk/; revision=19404
---
 pkgs/top-level/all-packages.nix | 40 +++++++++++++--------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cce78de1d707..9b5a9a269bbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5572,27 +5572,6 @@ let
     kernelPatches = [];
   };
 
-  kernel_2_6_31_zen5 = makeOverridable (import ../os-specific/linux/zen-kernel/2.6.31-zen5.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools
-      lib builderDefs;
-  };
-
-  kernel_2_6_31_zen5_bfs = kernel_2_6_31_zen5.override {
-    ckSched = true;
-  };
-
-  kernel_2_6_31_zen7 = makeOverridable (import ../os-specific/linux/zen-kernel/zen-stable.nix) {
-    inherit fetchurl stdenv perl mktemp module_init_tools
-      lib builderDefs;
-  };
-
-  kernel_2_6_31_zen7_bfs = kernel_2_6_31_zen7.override {
-    ckSched = true;
-  };
-
-  kernel_2_6_31_zen = kernel_2_6_31_zen7;
-  kernel_2_6_31_zen_bfs = kernel_2_6_31_zen7_bfs;
-
   kernel_2_6_32 = makeOverridable (import ../os-specific/linux/kernel/linux-2.6.32.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools;
     kernelPatches =
@@ -5601,6 +5580,22 @@ let
       ];
   };
 
+  kernel_2_6_32_zen4 = makeOverridable (import ../os-specific/linux/zen-kernel/2.6.32-zen4.nix) {
+    inherit fetchurl stdenv perl mktemp module_init_tools runCommand xz;
+  };
+
+  kernel_2_6_32_zen4_oldi686 = kernel_2_6_32_zen4.override {
+    features = {
+      oldI686 = true;
+    };
+  };
+
+  kernel_2_6_32_zen4_bfs = kernel_2_6_32_zen4.override {
+    features = {
+      ckSched = true;
+    };
+  };
+
   /* Kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
      specific kernel, we have a function that builds those packages
@@ -5727,9 +5722,6 @@ let
   kernelPackages_2_6_27 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_27);
   kernelPackages_2_6_28 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_28);
   kernelPackages_2_6_29 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_29);
-  kernelPackages_2_6_31_zen5 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_zen5);
-  kernelPackages_2_6_31_zen = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_zen);
-  kernelPackages_2_6_31_zen_bfs = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_zen_bfs);
   kernelPackages_2_6_31 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31);
   kernelPackages_2_6_32 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_32);