From b4b3cb2d013dfc1073da9036db26a77825063f7a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 18 Mar 2010 05:26:50 +0000
Subject: [PATCH] Fix version problems in Zen-kernel expression

svn path=/nixpkgs/trunk/; revision=20727
---
 pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix b/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix
index ae27dde09cc1..a3824a4fb15e 100644
--- a/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix
+++ b/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix
@@ -6,23 +6,26 @@ args @ {stdenv, fetchurl, xz, runCommand, userModeLinux ? false, extraConfig ? "
 let 
   conf = import ../kernel/config-blocks.nix; 
 
+  baseKernelVersion = "2.6.33";
+  ZenSuffix = "zen1";
+
 in
 
 import ../kernel/generic.nix (
   rec {
-    version = "2.6.32-zen4";
+    version = "${baseKernelVersion}-${ZenSuffix}";
 
     src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.33.tar.bz2";
+      url = "mirror://kernel/linux/kernel/v2.6/linux-${baseKernelVersion}.tar.bz2";
       sha256 = "1inmam21w13nyf5imgdb5palhiap41zcxf9k32i4ck1w7gg3gqk3";
     };
 
     kernelPatches = [
       {
-         name = "zen4"; 
-         patch = runCommand "2.6.33-zen1.patch" {} "${xz}/bin/lzma -d < ${ fetchurl {
-	   name = "2.6.33-zen1";
-           url = "http://downloads.zen-kernel.org/2.6.33/2.6.33-zen1.patch.lzma";
+         name = "${ZenSuffix}"; 
+         patch = runCommand "${baseKernelVersion}-${ZenSuffix}.patch" {} "${xz}/bin/lzma -d < ${ fetchurl {
+	   name = "${baseKernelVersion}-${ZenSuffix}.patch.lzma";
+           url = "http://downloads.zen-kernel.org/${baseKernelVersion}/${baseKernelVersion}-${ZenSuffix}.patch.lzma";
            sha256 = "0a72d8allr4qi4p6hbbjh33kmcgbg84as0dfb50gsffvaj2d3kwf";
          } } > $out";
       }