From 32bdb24a14a620ff44d62f793e7733b6805bea46 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Nov 2007 14:18:57 +0000
Subject: [PATCH] * Thunderbird 2.0.0.9. * Removed Thunderbird 1.5.

svn path=/nixpkgs/trunk/; revision=9796
---
 .../mailreaders/thunderbird-1.x/builder.sh    | 30 ------------
 .../mailreaders/thunderbird-1.x/default.nix   | 47 -------------------
 .../mailreaders/thunderbird-2.x/default.nix   |  6 +--
 pkgs/top-level/all-packages.nix               | 12 +----
 4 files changed, 4 insertions(+), 91 deletions(-)
 delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird-1.x/builder.sh
 delete mode 100644 pkgs/applications/networking/mailreaders/thunderbird-1.x/default.nix

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-1.x/builder.sh b/pkgs/applications/networking/mailreaders/thunderbird-1.x/builder.sh
deleted file mode 100644
index 7635910ae9fa..000000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird-1.x/builder.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-source $stdenv/setup
-
-postInstall=postInstall
-postInstall() {
-
-    # Strip some more stuff
-    strip -S $out/lib/*/* || true
-
-    # This fixes starting Thunderbird when there already is a running
-    # instance.  The `thunderbird' wrapper script actually expects to
-    # be in the same directory as `run-mozilla.sh', apparently.
-    libDir=$(cd $out/lib && ls -d thunderbird-*)
-    test -n "$libDir"
-    cd $out/bin
-    mv thunderbird ../lib/$libDir/
-    ln -s ../lib/$libDir/thunderbird .
-
-    # Register extensions etc.
-    echo "running thunderbird -register..."
-    (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./thunderbird-bin -register) || false
-
-    echo "running regxpcom..."
-    (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./regxpcom) || false
-
-    # Put the Thunderbird icon in the right place.
-    ensureDir $out/lib/$libDir/chrome/icons/default
-    ln -s ../../../icons/default.xpm  $out/lib/$libDir/chrome/icons/default/
-}
-
-genericBuild
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-1.x/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-1.x/default.nix
deleted file mode 100644
index 2e969d205075..000000000000
--- a/pkgs/applications/networking/mailreaders/thunderbird-1.x/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi
-, libjpeg, libpng, zlib, cairo
-
-, # If you want the resulting program to call itself "Thunderbird"
-  # instead of "Mail", enable this option.  However, those
-  # binaries may not be distributed without permission from the
-  # Mozilla Foundation, see
-  # http://www.mozilla.org/foundation/trademarks/.
-  enableOfficialBranding ? false
-    
-}:
-
-stdenv.mkDerivation {
-  name = "thunderbird-1.5.0.10";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.10/source/thunderbird-1.5.0.10-source.tar.bz2;
-    sha1 = "a6467c946f9e668bcf7b3a06dcaeceb601b98fce";
-  };
-
-  buildInputs = [
-    pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo
-  ];
-
-  configureFlags = [
-    "--enable-application=mail"
-    "--enable-optimize"
-    "--disable-debug"
-    "--enable-xft"
-    "--disable-freetype2"
-    "--enable-svg"
-    "--enable-canvas"
-    "--enable-strip"
-    "--enable-default-toolkit=gtk2"
-    "--with-system-jpeg"
-    "--with-system-png"
-    "--with-system-zlib"
-    "--enable-system-cairo"
-    "--enable-extensions=default"
-  ]
-  ++ (if enableOfficialBranding then ["--enable-official-branding"] else []);
-
-  meta = {
-    description = "Mozilla Thunderbird, a full-featured email client";
-  };
-}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix
index bde5f6364c4d..d90d28b373cf 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-2.x/default.nix
@@ -11,12 +11,12 @@
 }:
 
 stdenv.mkDerivation {
-  name = "thunderbird-2.0.0.6";
+  name = "thunderbird-2.0.0.9";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.6/source/thunderbird-2.0.0.6-source.tar.bz2;
-    sha1 = "c38b17ad0fc51aed96bacafe3ffe7ed0edd0738c";
+    url = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.9/source/thunderbird-2.0.0.9-source.tar.bz2;
+    sha1 = "fede9db98f25adb978b84129a6d15a4dbe6bbb3e";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b120869d75e8..8024f5079c30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4205,17 +4205,7 @@ rec {
     inherit (xlibs) xextproto libXtst inputproto;
   };
 
-  thunderbird = thunderbird2;
-
-  thunderbird1 = import ../applications/networking/mailreaders/thunderbird-1.x {
-    inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
-    inherit (gtkLibs) gtk;
-    inherit (gnome) libIDL;
-    inherit (xlibs) libXi;
-    #enableOfficialBranding = true;
-  };
-
-  thunderbird2 = import ../applications/networking/mailreaders/thunderbird-2.x {
+  thunderbird = import ../applications/networking/mailreaders/thunderbird-2.x {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
     inherit (gtkLibs) gtk;
     inherit (gnome) libIDL;