From 2ffc686b67bfab79440f8190d10903d44eb22579 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Dec 2008 00:06:14 +0000
Subject: [PATCH] * Latest Wine, Thunderbird.

svn path=/nixpkgs/trunk/; revision=13527
---
 .../networking/mailreaders/thunderbird-2.x/default.nix      | 6 +++---
 pkgs/misc/emulators/wine/default.nix                        | 6 +++---
 pkgs/top-level/release.nix                                  | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix
index 94f2ffd4cf4d..6f052936c13b 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix
@@ -11,13 +11,13 @@
 }:
 
 stdenv.mkDerivation {
-  name = "thunderbird-2.0.0.17";
+  name = "thunderbird-2.0.0.18";
 
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.17/source/thunderbird-2.0.0.17-source.tar.bz2;
-    sha1 = "98a7ff5206fe1bddcb895dc2276e348229af99d9";
+    url = ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.18/source/thunderbird-2.0.0.18-source.tar.bz2;
+    sha1 = "4d05300280763e34c7a115835523ed2805f7733c";
   };
 
   buildInputs = [
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index a8e82d306f85..95505071a385 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -8,11 +8,11 @@ assert stdenv.isLinux;
 let lib = import ../../../lib/default.nix; in
 
 stdenv.mkDerivation {
-  name = "wine-1.1.2";
+  name = "wine-1.1.9";
 
   src = fetchurl {
-    url = mirror://sourceforge/wine/wine-1.1.7.tar.bz2;
-    sha256 = "1wj20pz638x27db1vpgf4m53wbdia95bp7dxi1zdqlfnp54da22w";
+    url = mirror://sourceforge/wine/wine-1.1.9.tar.bz2;
+    sha256 = "1jhy7l5q1jri529n5070f4wjigbw4dr7d4jgdc10v6hxfmlp1mzy";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 1a6db57efd31..91cbdb870c15 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -95,6 +95,8 @@ let
       pan = test (pkgs: pkgs.pan);
       perl = test (pkgs: pkgs.perl);
       python = test (pkgs: pkgs.python);
+      thunderbird = test (pkgs: pkgs.thunderbird);
+      wine = test (pkgs: pkgs.wine);
               
   };