From 054c33a676a88844862405274a3a9744656078ab Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 18 Nov 2007 10:37:32 +0000
Subject: [PATCH] bridge_utils added

svn path=/nixpkgs/trunk/; revision=9750
---
 .../linux/bridge_utils/default.nix            | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 19 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/bridge_utils/default.nix

diff --git a/pkgs/os-specific/linux/bridge_utils/default.nix b/pkgs/os-specific/linux/bridge_utils/default.nix
new file mode 100644
index 000000000000..a54e52b11c9e
--- /dev/null
+++ b/pkgs/os-specific/linux/bridge_utils/default.nix
@@ -0,0 +1,19 @@
+args:
+args.stdenv.mkDerivation {
+  name = "bridge-utils-1.2";
+
+  src = args.fetchurl {
+    url = http://mirror/sourceforge/bridge/bridge-utils-1.2.tar.gz;
+    sha256 = "0jg3z51c2c34byg4zi39j9g4b66js5kanjhid77hpa0jdfmryfy9";
+  };
+
+  buildInputs =(with args; [autoconf automake]);
+
+  preConfigure="autoreconf";
+
+  meta = { 
+      description = "http://sourceforge.net/projects/bridge/";
+      homepage = [ "http://www.linux-foundation.org/en/Net:Bridge/" "http://sourceforge.net/projects/bridge/" ];
+      license = "GPL";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75025c9298c0..828d5365a611 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2818,6 +2818,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  bridge_utils = import ../os-specific/linux/bridge_utils {
+    inherit fetchurl stdenv autoconf automake;
+  };
+
   alsaUtils = import ../os-specific/linux/alsa/utils {
     inherit fetchurl stdenv alsaLib ncurses gettext;
   };
@@ -2953,7 +2957,7 @@ rec {
     modules = [];
   };
 
-  kernel = kernel_2_6_21;
+  kernel = kernel_2_6_23;
 
   systemKernel = (if (getConfig ["kernel" "version"] "2.6.21") == "2.6.22" then
 	kernel_2_6_22 else if (getConfig ["kernel" "version"] "2.6.21") == "2.6.23" then
@@ -3112,6 +3116,19 @@ rec {
       { name = "paravirt-nvidia";
         patch = ../os-specific/linux/kernel/2.6.22-paravirt-nvidia.patch;
       }
+      { # resume with resume=swap:/dev/xx
+        name = "tux on ice"; # (swsusp2)
+        patch = fetchurl {
+          url = "http://www.tuxonice.net/downloads/all/tuxonice-3.0-rc2-for-2.6.23.1.patch.bz2";
+          sha256 = "ef86267b6f3d7e309221f5173a881afae1dfa57418be5b3963f2380b0633ca1a";
+        };
+        extraConfig = "
+          CONFIG_SUSPEND2=y
+          CONFIG_SUSPEND2_FILE=y
+          CONFIG_SUSPEND2_SWAP=y
+          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;