From 8e02768459674b6d7478b5d39d732fc8a989a13e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 30 Sep 2011 07:10:47 +0000
Subject: [PATCH] Firefox  7.0 release

svn path=/nixpkgs/trunk/; revision=29544
---
 pkgs/applications/networking/browsers/firefox/7.0.nix | 6 +++---
 pkgs/top-level/all-packages.nix                       | 4 ++--
 pkgs/top-level/release.nix                            | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/7.0.nix b/pkgs/applications/networking/browsers/firefox/7.0.nix
index d9e94ead33a4..c14386e5f9ea 100644
--- a/pkgs/applications/networking/browsers/firefox/7.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/7.0.nix
@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "7.0b1";
+  firefoxVersion = "7.0";
   
   xulVersion = "7.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 = "0s8lv07nggdf8ad2yx7sgq1mfy1dvzir0f6x4km911yc9qyhwmwk";
+    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
+    sha256 = "1fpadlsdc8d739cz52dicn68v2ilv044hxivilgy9jnrazznrm42";
   };
   
   commonConfigureFlags =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21881994ac70..7528fb7264ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6576,12 +6576,12 @@ let
 
   firefox60Wrapper = wrapFirefox firefox60Pkgs.firefox "firefox" "";
 
-  firefox70b1Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix {
+  firefox70Pkgs = callPackage ../applications/networking/browsers/firefox/7.0.nix {
     inherit (gtkLibs) gtk pango;
     inherit (gnome) libIDL;
   };
 
-  firefox70b1Wrapper = lowPrio (wrapFirefox firefox70b1Pkgs.firefox "firefox" "");
+  firefox70Wrapper = lowPrio (wrapFirefox firefox70Pkgs.firefox "firefox" "");
 
   flac = callPackage ../applications/audio/flac { };
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 1e189d06242f..247b9be61ad3 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -387,6 +387,7 @@ with (import ./release-lib.nix);
   firefox36Pkgs.firefox = linux;
   firefox50Pkgs.firefox = linux;
   firefox60Pkgs.firefox = linux;
+  firefox70Pkgs.firefox = linux;
 
   gnome = {
     gnome_panel = linux;