* Disable TuxOnIce for now, the patch doesn't apply to 2.6.23.16.

svn path=/nixpkgs/trunk/; revision=10623
This commit is contained in:
Eelco Dolstra 2008-02-11 10:22:17 +00:00
parent 9274b390f4
commit e28ea5fcd5

View File

@ -3835,6 +3835,7 @@ rec {
kernel_2_6_23 = import ../os-specific/linux/kernel/linux-2.6.23.nix { kernel_2_6_23 = import ../os-specific/linux/kernel/linux-2.6.23.nix {
inherit fetchurl stdenv perl mktemp module_init_tools; inherit fetchurl stdenv perl mktemp module_init_tools;
kernelPatches = [ kernelPatches = [
/*
{ # resume with resume=swap:/dev/xx { # resume with resume=swap:/dev/xx
name = "tux on ice"; # (swsusp2) name = "tux on ice"; # (swsusp2)
patch = fetchurl { patch = fetchurl {
@ -3848,6 +3849,7 @@ rec {
CONFIG_CRYPTO_LZF=y CONFIG_CRYPTO_LZF=y
"; ";
} }
*/
{ name = "fbsplash-0.9.2-r5-2.6.21"; { name = "fbsplash-0.9.2-r5-2.6.21";
patch = fetchurl { patch = fetchurl {
url = http://dev.gentoo.org/~dsd/genpatches/trunk/2.6.22/4200_fbsplash-0.9.2-r5.patch; url = http://dev.gentoo.org/~dsd/genpatches/trunk/2.6.22/4200_fbsplash-0.9.2-r5.patch;
@ -3855,6 +3857,7 @@ rec {
}; };
extraConfig = "CONFIG_FB_SPLASH=y"; extraConfig = "CONFIG_FB_SPLASH=y";
} }
/* !!! Not needed anymore for the NixOS LiveCD - we have AUFS. */
{ name = "unionfs-2.2.2"; { name = "unionfs-2.2.2";
patch = fetchurl { patch = fetchurl {
url = http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-2.2.2_for_2.6.23.13.diff.gz; url = http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-2.2.2_for_2.6.23.13.diff.gz;