Author: eelco
Date: Thu Feb 2 15:44:22 2012
New Revision: 31984
URL: https://nixos.org/websvn/nix/?rev=31984&sc=1
Log:
* Added Firefox 10.0. P.S. it seems that Firefox 10 no longer needs
--enable-official-branding to get a browser that calls itself
"Firefox". But I'll leave the flag in for the moment.
* Removed Firefox 8.0.
Added:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/10.0.nix
- copied, changed from r31977,
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/9.0.nix
Deleted:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/8.0.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
nixpkgs/trunk/pkgs/top-level/release.nix
Copied and modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/10.0.nix (from
r31977, nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/9.0.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/9.0.nix Thu Feb
2 10:52:15 2012 (r31977, copy source)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/10.0.nix
Thu Feb 2 15:44:22 2012 (r31984)
@@ -15,14 +15,14 @@
rec {
- firefoxVersion = "9.0.1";
+ firefoxVersion = "10.0";
- xulVersion = "9.0.1"; # this attribute is used by other packages
+ xulVersion = "10.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";;
- sha1 = "e0748d86753eead5c0929d74158c601bf33b5db0";
+ sha1 = "cbf1fb0efe0a3a2b2dafaa324b136736e93de70c";
};
commonConfigureFlags =
@@ -139,7 +139,7 @@
[ "--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";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Feb 2 14:54:56
2012 (r31983)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Feb 2 15:44:22
2012 (r31984)
@@ -6838,19 +6838,19 @@
firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; };
- firefox80Pkgs = callPackage
../applications/networking/browsers/firefox/8.0.nix {
+ firefox90Pkgs = callPackage
../applications/networking/browsers/firefox/9.0.nix {
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
};
- firefox80Wrapper = wrapFirefox { browser = firefox80Pkgs.firefox; };
+ firefox90Wrapper = wrapFirefox { browser = firefox90Pkgs.firefox; };
- firefox90Pkgs = callPackage
../applications/networking/browsers/firefox/9.0.nix {
+ firefox100Pkgs = callPackage
../applications/networking/browsers/firefox/10.0.nix {
inherit (gtkLibs) gtk pango;
inherit (gnome) libIDL;
};
- firefox90Wrapper = wrapFirefox { browser = firefox90Pkgs.firefox; };
+ firefox100Wrapper = wrapFirefox { browser = firefox100Pkgs.firefox; };
flac = callPackage ../applications/audio/flac { };
Modified: nixpkgs/trunk/pkgs/top-level/release.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/release.nix Thu Feb 2 14:54:56 2012
(r31983)
+++ nixpkgs/trunk/pkgs/top-level/release.nix Thu Feb 2 15:44:22 2012
(r31984)
@@ -363,8 +363,8 @@
};
firefox36Pkgs.firefox = linux;
- firefox80Pkgs.firefox = linux;
firefox90Pkgs.firefox = linux;
+ firefox100Pkgs.firefox = linux;
gnome = {
gnome_panel = linux;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
