From e28ea5fcd58fd1258132bf991283322865632f31 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Feb 2008 10:22:17 +0000
Subject: [PATCH] * Disable TuxOnIce for now, the patch doesn't apply to
 2.6.23.16.

svn path=/nixpkgs/trunk/; revision=10623
---
 pkgs/top-level/all-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc227696bf37..f22c500a63c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3835,6 +3835,7 @@ rec {
   kernel_2_6_23 = import ../os-specific/linux/kernel/linux-2.6.23.nix {
     inherit fetchurl stdenv perl mktemp module_init_tools;
     kernelPatches = [
+      /*
       { # resume with resume=swap:/dev/xx
         name = "tux on ice"; # (swsusp2)
         patch = fetchurl {
@@ -3848,6 +3849,7 @@ rec {
           CONFIG_CRYPTO_LZF=y
         ";
       }
+      */
       { name = "fbsplash-0.9.2-r5-2.6.21";
         patch = fetchurl {
           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";
       }
+      /* !!! Not needed anymore for the NixOS LiveCD - we have AUFS. */
       { name = "unionfs-2.2.2";
         patch = fetchurl {
           url = http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-2.2.2_for_2.6.23.13.diff.gz;