Fix version problems in Zen-kernel expression

svn path=/nixpkgs/trunk/; revision=20727

+9 -6
+9 -6
pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix
··· 6 let 7 conf = import ../kernel/config-blocks.nix; 8 9 in 10 11 import ../kernel/generic.nix ( 12 rec { 13 - version = "2.6.32-zen4"; 14 15 src = fetchurl { 16 - url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.33.tar.bz2"; 17 sha256 = "1inmam21w13nyf5imgdb5palhiap41zcxf9k32i4ck1w7gg3gqk3"; 18 }; 19 20 kernelPatches = [ 21 { 22 - name = "zen4"; 23 - patch = runCommand "2.6.33-zen1.patch" {} "${xz}/bin/lzma -d < ${ fetchurl { 24 - name = "2.6.33-zen1"; 25 - url = "http://downloads.zen-kernel.org/2.6.33/2.6.33-zen1.patch.lzma"; 26 sha256 = "0a72d8allr4qi4p6hbbjh33kmcgbg84as0dfb50gsffvaj2d3kwf"; 27 } } > $out"; 28 }
··· 6 let 7 conf = import ../kernel/config-blocks.nix; 8 9 + baseKernelVersion = "2.6.33"; 10 + ZenSuffix = "zen1"; 11 + 12 in 13 14 import ../kernel/generic.nix ( 15 rec { 16 + version = "${baseKernelVersion}-${ZenSuffix}"; 17 18 src = fetchurl { 19 + url = "mirror://kernel/linux/kernel/v2.6/linux-${baseKernelVersion}.tar.bz2"; 20 sha256 = "1inmam21w13nyf5imgdb5palhiap41zcxf9k32i4ck1w7gg3gqk3"; 21 }; 22 23 kernelPatches = [ 24 { 25 + name = "${ZenSuffix}"; 26 + patch = runCommand "${baseKernelVersion}-${ZenSuffix}.patch" {} "${xz}/bin/lzma -d < ${ fetchurl { 27 + name = "${baseKernelVersion}-${ZenSuffix}.patch.lzma"; 28 + url = "http://downloads.zen-kernel.org/${baseKernelVersion}/${baseKernelVersion}-${ZenSuffix}.patch.lzma"; 29 sha256 = "0a72d8allr4qi4p6hbbjh33kmcgbg84as0dfb50gsffvaj2d3kwf"; 30 } } > $out"; 31 }