I am an idiot. Correcting -zen1 -> -zen2

svn path=/nixpkgs/trunk/; revision=17242
This commit is contained in:
Michael Raskin 2009-09-18 06:38:36 +00:00
parent f13b0781cc
commit 86a90971d7
4 changed files with 5 additions and 5 deletions

View File

@ -1,12 +1,12 @@
a : a :
let let
s = import ./src-for-2.6.31-zen1.nix; s = import ./src-for-2.6.31-zen2.nix;
in in
(import ../kernel/generic.nix) (rec { (import ../kernel/generic.nix) (rec {
inherit (a) stdenv fetchurl perl mktemp module_init_tools; inherit (a) stdenv fetchurl perl mktemp module_init_tools;
src = a.builderDefs.fetchGitFromSrcInfo s; src = a.builderDefs.fetchGitFromSrcInfo s;
version = "2.6.31-zen1"; version = "2.6.31-zen2";
config = "./kernel-config"; config = "./kernel-config";
features = { features = {
iwlwifi = true; iwlwifi = true;

View File

@ -5378,12 +5378,12 @@ let
ckSched = true; 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 inherit fetchurl stdenv perl mktemp module_init_tools
lib builderDefs; 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; ckSched = true;
}; };
@ -5514,7 +5514,7 @@ let
kernelPackages_2_6_31_rc2 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_rc2); 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_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_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); kernelPackages_2_6_31 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31);
# The current default kernel / kernel modules. # The current default kernel / kernel modules.