From 9d9e33b98d8319cf10e77694e6dbd7ed28339a2f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 2 Feb 2012 15:44:22 +0000
Subject: [PATCH] * Added Firefox 10.0.  P.S. it seems that Firefox 10 no
 longer needs   --enable-official-branding to get a browser that calls itself 
  "Firefox".  But I'll leave the flag in for the moment. * Removed Firefox
 8.0.

svn path=/nixpkgs/trunk/; revision=31984
---
 .../browsers/firefox/{8.0.nix => 10.0.nix}         |  8 ++++----
 pkgs/top-level/all-packages.nix                    | 14 +++++++-------
 pkgs/top-level/release.nix                         |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename pkgs/applications/networking/browsers/firefox/{8.0.nix => 10.0.nix} (96%)

diff --git a/pkgs/applications/networking/browsers/firefox/8.0.nix b/pkgs/applications/networking/browsers/firefox/10.0.nix
similarity index 96%
rename from pkgs/applications/networking/browsers/firefox/8.0.nix
rename to pkgs/applications/networking/browsers/firefox/10.0.nix
index 823d6e0cbd28..79869b324b9b 100644
--- a/pkgs/applications/networking/browsers/firefox/8.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/10.0.nix
@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "8.0.1";
+  firefoxVersion = "10.0";
   
-  xulVersion = "8.0.1"; # this attribute is used by other packages
+  xulVersion = "10.0"; # this attribute is used by other packages
 
   
   src = fetchurl {
     url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "0dd207c5cee9d53114c55aa23eeca36b754bc128";
+    sha1 = "cbf1fb0efe0a3a2b2dafaa324b136736e93de70c";
   };
   
   commonConfigureFlags =
@@ -139,7 +139,7 @@ rec {
       [ "--enable-application=browser"
         "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
         "--enable-chrome-format=jar"
-	"--disable-elf-hack"
+        "--disable-elf-hack"
       ]
       ++ commonConfigureFlags
       ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99aab924b0ca..ed955eceb3ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6838,13 +6838,6 @@ let
 
   firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; };
 
-  firefox80Pkgs = callPackage ../applications/networking/browsers/firefox/8.0.nix {
-    inherit (gtkLibs) gtk pango;
-    inherit (gnome) libIDL;
-  };
-
-  firefox80Wrapper = wrapFirefox { browser = firefox80Pkgs.firefox; };
-
   firefox90Pkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix {
     inherit (gtkLibs) gtk pango;
     inherit (gnome) libIDL;
@@ -6852,6 +6845,13 @@ let
 
   firefox90Wrapper = wrapFirefox { browser = firefox90Pkgs.firefox; };
 
+  firefox100Pkgs = callPackage ../applications/networking/browsers/firefox/10.0.nix {
+    inherit (gtkLibs) gtk pango;
+    inherit (gnome) libIDL;
+  };
+
+  firefox100Wrapper = wrapFirefox { browser = firefox100Pkgs.firefox; };
+
   flac = callPackage ../applications/audio/flac { };
 
   flashplayer = flashplayer11;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 08f6e993b11f..44419a040fdb 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -363,8 +363,8 @@ with (import ./release-lib.nix);
   };
 
   firefox36Pkgs.firefox = linux;
-  firefox80Pkgs.firefox = linux;
   firefox90Pkgs.firefox = linux;
+  firefox100Pkgs.firefox = linux;
 
   gnome = {
     gnome_panel = linux;