Author: eelco
Date: Tue Mar 22 13:36:35 2011
New Revision: 26457
URL: https://svn.nixos.org/websvn/nix/?rev=26457&sc=1

Log:
* Firefox 4.0.  Completely untested.
* Removed Firefox 3.5.

Deleted:
   nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/3.5.nix
   nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0-rc1.nix
   nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0-rc2.nix
Modified:
   nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix Tue Mar 
22 13:21:24 2011        (r26456)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/4.0.nix Tue Mar 
22 13:36:35 2011        (r26457)
@@ -13,14 +13,14 @@
 
 rec {
 
-  firefoxVersion = "4.0b7";
+  firefoxVersion = "4.0";
   
-  xulVersion = "2.0b7"; # this attribute is used by other packages
+  xulVersion = "2.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";;
-    sha256 = 
"02cc466a92af828ff3bc563d4515bd98064cf5f136b5871e072b9408fb4db128";
+    sha1 = "403da9dd65662e5c4dd34299214e04cb6f80575e";
   };
 
   commonConfigureFlags =

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       Tue Mar 22 13:21:24 
2011        (r26456)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       Tue Mar 22 13:36:35 
2011        (r26457)
@@ -5991,13 +5991,6 @@
   firefox = firefox36Pkgs.firefox;
   firefoxWrapper = firefox36Wrapper;
 
-  firefox35Pkgs = callPackage 
../applications/networking/browsers/firefox/3.5.nix {
-    inherit (gtkLibs) gtk pango;
-    inherit (gnome) libIDL;
-  };
-
-  firefox35Wrapper = wrapFirefox firefox35Pkgs.firefox "firefox" "";
-
   firefox36Pkgs = callPackage 
../applications/networking/browsers/firefox/3.6.nix {
     inherit (gtkLibs) gtk pango;
     inherit (gnome) libIDL;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to