From bdf034862b243e1cfd5404cbdccb6fd49f61cb50 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Jul 2011 14:04:43 +0000
Subject: [PATCH] * Make Firefox 5.0 the default.

svn path=/nixpkgs/trunk/; revision=27593
---
 pkgs/applications/networking/irc/chatzilla/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                        | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix
index b981c105a0c9..a0197a99a509 100644
--- a/pkgs/applications/networking/irc/chatzilla/default.nix
+++ b/pkgs/applications/networking/irc/chatzilla/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "chatzilla-0.9.86";
+  name = "chatzilla-0.9.86.1";
   
   src = fetchurl {
     # Obtained from http://chatzilla.rdmsoft.com/xulrunner/.
-    url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.86-xr.zip;
-    sha256 = "1z8767arx2ncch0pzkdzhisjgmd45qianahz3xr8isvahv2klj5x";
+    url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.86.1-xr.zip;
+    sha256 = "06s4g0x7hsckd7wr904j8rzksvqhvcrhl9zwga2458rgafcbbghd";
   };
 
   buildInputs = [ unzip ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1521ee73efe..4ea4db5be000 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2491,10 +2491,10 @@ let
   xulrunnerWrapper = {application, launcher}:
     import ../development/interpreters/xulrunner/wrapper {
       inherit stdenv application launcher;
-      xulrunner = firefox40Pkgs.xulrunner;
+      xulrunner = firefox50Pkgs.xulrunner;
     };
 
-  xulrunner = firefox40Pkgs.xulrunner;
+  xulrunner = firefox50Pkgs.xulrunner;
 
   ### DEVELOPMENT / MISC
 
@@ -6239,9 +6239,9 @@ let
 
   filelight = newScope pkgs.kde4 ../applications/misc/filelight { };
 
-  firefox = firefox40Pkgs.firefox;
+  firefox = firefox50Pkgs.firefox;
 
-  firefoxWrapper = firefox40Wrapper;
+  firefoxWrapper = firefox50Wrapper;
 
   firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
     inherit (gtkLibs) gtk pango;