Author: raskin
Date: Fri Sep 30 07:10:47 2011
New Revision: 29544
URL: https://ssl.nixos.org/websvn/nix/?rev=29544&sc=1

Log:
Firefox  7.0 release

Modified:
   nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/7.0.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix
   nixpkgs/trunk/pkgs/top-level/release.nix

Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/7.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/7.0.nix Thu Sep 
29 21:55:12 2011        (r29543)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/7.0.nix Fri Sep 
30 07:10:47 2011        (r29544)
@@ -15,14 +15,14 @@
 
 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 =

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       Thu Sep 29 21:55:12 
2011        (r29543)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       Fri Sep 30 07:10:47 
2011        (r29544)
@@ -6576,12 +6576,12 @@
 
   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 { };
 

Modified: nixpkgs/trunk/pkgs/top-level/release.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/release.nix    Thu Sep 29 21:55:12 2011        
(r29543)
+++ nixpkgs/trunk/pkgs/top-level/release.nix    Fri Sep 30 07:10:47 2011        
(r29544)
@@ -387,6 +387,7 @@
   firefox36Pkgs.firefox = linux;
   firefox50Pkgs.firefox = linux;
   firefox60Pkgs.firefox = linux;
+  firefox70Pkgs.firefox = linux;
 
   gnome = {
     gnome_panel = linux;
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to