[Nix-dev] [PATCH 2/2] Firefox 11 release

[Kirill Elagin]

---
 .../networking/browsers/firefox/11.0.nix           |    8 ++++----
 pkgs/top-level/all-packages.nix                    |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/11.0.nix
b/pkgs/applications/networking/browsers/firefox/11.0.nix
index fd72b51..4b14d4c 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 =
@@ -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 fb88ba1..ccb3f11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6623,7 +6623,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;
@@ -6641,13 +6641,13 @@ let
     inherit (gnome) libIDL;
   };

-  firefox100Wrapper = wrapFirefox { browser = firefox100Pkgs.firefox; };
+  firefox100Wrapper = lowPrio (wrapFirefox { browser =
firefox100Pkgs.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 { };

-- 

--
Кирилл Елагин