* Firefox 11 (contributed by Kirill Elagin). Unfortunately it's not

  called "Firefox" anymore when built without official branding.
  Apparently that was a SNAFU in Firefox 10.

svn path=/nixpkgs/trunk/; revision=33319

4 files changed, 16 insertions, 13 deletions

diff --git a/pkgs/applications/networking/browsers/firefox/10.0.nix b/pkgs/applications/networking/browsers/firefox/10.0.nix
index 0836fc159c1..ff16cad0ee1 100644
--- a/pkgs/applications/networking/browsers/firefox/10.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/10.0.nix
@@ -170,6 +170,7 @@ rec {
     meta = {
       description = "Mozilla Firefox - the browser, reloaded";
       homepage = http://www.mozilla.com/en-US/firefox/;
+      maintainers = [ stdenv.lib.maintainers.eelco ];
     };
 
     passthru = {
diff --git a/pkgs/applications/networking/browsers/firefox/11.0.nix b/pkgs/applications/networking/browsers/firefox/11.0.nix
index fd72b51f5b5..28f0f476833 100644
--- a/pkgs/applications/networking/browsers/firefox/11.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/11.0.nix
@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "11.0b1";
+  firefoxVersion = "11.0";
   
   xulVersion = "11.0"; # this attribute is used by other packages
 
   
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha256 = "1f9p2jmjvhmb23wmvj84jj22wd9g803k6pdjm8glwmkzwnva8x1b";
+    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
+    md5 = "4b07acf47857aff72776d805409cdd1b";
   };
   
   commonConfigureFlags =
@@ -32,7 +32,7 @@ rec {
       "--with-system-jpeg"
       "--with-system-zlib"
       "--with-system-bz2"
-      #"--with-system-nspr" # <-- There are links to nspr 4.9.0, but no file...
+      "--with-system-nspr"
       # "--with-system-nss"
       # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
       "--enable-system-cairo"
@@ -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";
@@ -170,6 +170,7 @@ rec {
     meta = {
       description = "Mozilla Firefox - the browser, reloaded";
       homepage = http://www.mozilla.com/en-US/firefox/;
+      maintainers = [ stdenv.lib.maintainers.eelco ];
     };
 
     passthru = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4bd4adb8381..4b038ad6f5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6625,7 +6625,7 @@ let
 
   firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
 
-  firefoxPkgs = pkgs.firefox100Pkgs;
+  firefoxPkgs = pkgs.firefox11Pkgs;
 
   firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
     inherit (gnome) libIDL;
@@ -6633,23 +6633,23 @@ let
 
   firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; };
 
-  firefox90Pkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix {
+  firefox9Pkgs = callPackage ../applications/networking/browsers/firefox/9.0.nix {
     inherit (gnome) libIDL;
   };
 
-  firefox90Wrapper = wrapFirefox { browser = firefox90Pkgs.firefox; };
+  firefox9Wrapper = wrapFirefox { browser = firefox9Pkgs.firefox; };
 
-  firefox100Pkgs = callPackage ../applications/networking/browsers/firefox/10.0.nix {
+  firefox10Pkgs = callPackage ../applications/networking/browsers/firefox/10.0.nix {
     inherit (gnome) libIDL;
   };
 
-  firefox100Wrapper = wrapFirefox { browser = firefox100Pkgs.firefox; };
+  firefox10Wrapper = wrapFirefox { browser = firefox10Pkgs.firefox; };
 
   firefox11Pkgs = callPackage ../applications/networking/browsers/firefox/11.0.nix {
     inherit (gnome) libIDL;
   };
 
-  firefox11Wrapper = lowPrio (wrapFirefox { browser = firefox11Pkgs.firefox; });
+  firefox11Wrapper = wrapFirefox { browser = firefox11Pkgs.firefox; };
 
   flac = callPackage ../applications/audio/flac { };
 
@@ -6663,6 +6663,7 @@ let
 
   flashplayer11 = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
     debug = getConfig ["flashplayer" "debug"] false;
+    # !!! Fix the dependency on two different builds of nss.
   };
 
   freecad = callPackage ../applications/graphics/freecad {
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index b73d2e19ac7..f88ac212d6c 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -362,8 +362,8 @@ with (import ./release-lib.nix);
   };
 
   firefox36Pkgs.firefox = linux;
-  firefox90Pkgs.firefox = linux;
-  firefox100Pkgs.firefox = linux;
+  firefox10Pkgs.firefox = linux;
+  firefox11Pkgs.firefox = linux;
 
   gnome = {
     gnome_panel = linux;