From 86a90971d7dd428e8129bcf1da36d6ae006673c4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 18 Sep 2009 06:38:36 +0000
Subject: [PATCH] I am an idiot. Correcting -zen1 -> -zen2

svn path=/nixpkgs/trunk/; revision=17242
---
 .../linux/zen-kernel/{2.6.31-zen1.nix => 2.6.31-zen2.nix}   | 4 ++--
 .../{src-for-2.6.31-zen1.nix => src-for-2.6.31-zen2.nix}    | 0
 ...nfo-for-2.6.31-zen1.nix => src-info-for-2.6.31-zen2.nix} | 0
 pkgs/top-level/all-packages.nix                             | 6 +++---
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/os-specific/linux/zen-kernel/{2.6.31-zen1.nix => 2.6.31-zen2.nix} (97%)
 rename pkgs/os-specific/linux/zen-kernel/{src-for-2.6.31-zen1.nix => src-for-2.6.31-zen2.nix} (100%)
 rename pkgs/os-specific/linux/zen-kernel/{src-info-for-2.6.31-zen1.nix => src-info-for-2.6.31-zen2.nix} (100%)

diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.31-zen1.nix b/pkgs/os-specific/linux/zen-kernel/2.6.31-zen2.nix
similarity index 97%
rename from pkgs/os-specific/linux/zen-kernel/2.6.31-zen1.nix
rename to pkgs/os-specific/linux/zen-kernel/2.6.31-zen2.nix
index 7c7450489f41..3dcfede595ab 100644
--- a/pkgs/os-specific/linux/zen-kernel/2.6.31-zen1.nix
+++ b/pkgs/os-specific/linux/zen-kernel/2.6.31-zen2.nix
@@ -1,12 +1,12 @@
 a :  
 let 
-  s = import ./src-for-2.6.31-zen1.nix;
+  s = import ./src-for-2.6.31-zen2.nix;
 in 
 (import ../kernel/generic.nix) (rec {
   inherit (a) stdenv fetchurl perl mktemp module_init_tools;
 
   src = a.builderDefs.fetchGitFromSrcInfo s;
-  version = "2.6.31-zen1";
+  version = "2.6.31-zen2";
   config = "./kernel-config";
   features = {
     iwlwifi = true;
diff --git a/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen1.nix b/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen2.nix
similarity index 100%
rename from pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen1.nix
rename to pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen2.nix
diff --git a/pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen1.nix b/pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen2.nix
similarity index 100%
rename from pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen1.nix
rename to pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen2.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b01e9b9e9d76..fb10c8aa748e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5378,12 +5378,12 @@ let
     ckSched = true;
   };
 
-  kernel_2_6_31_zen1 = makeOverridable (import ../os-specific/linux/zen-kernel/2.6.31-zen1.nix) {
+  kernel_2_6_31_zen2 = makeOverridable (import ../os-specific/linux/zen-kernel/2.6.31-zen2.nix) {
     inherit fetchurl stdenv perl mktemp module_init_tools 
       lib builderDefs;
   };
 
-  kernel_2_6_31_zen1_bfs = kernel_2_6_31_zen1.override {
+  kernel_2_6_31_zen2_bfs = kernel_2_6_31_zen2.override {
     ckSched = true;
   };
 
@@ -5514,7 +5514,7 @@ let
   kernelPackages_2_6_31_rc2 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_rc2);
   kernelPackages_2_6_31_rc2_old_i686 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_rc2_old_i686);
   kernelPackages_2_6_31_zen0 =          recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_zen0);
-  kernelPackages_2_6_31_zen1 =          recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_zen1);
+  kernelPackages_2_6_31_zen2 =          recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_zen2);
   kernelPackages_2_6_31 =          recurseIntoAttrs (kernelPackagesFor kernel_2_6_31);
 
   # The current default kernel / kernel modules.