Author: eelco
Date: Tue Mar 20 23:59:09 2012
New Revision: 33319
URL: https://nixos.org/websvn/nix/?rev=33319&sc=1
Log:
* Firefox 11 (contributed by Kirill Elagin). Unfortunately it's not
called "Firefox" anymore when built without official branding.
Apparently that was a SNAFU in Firefox 10.
Replaced:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/11.0.nix
- copied, changed from r33315,
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/10.0.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/10.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/10.0.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/10.0.nix
Tue Mar 20 23:55:22 2012 (r33318)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/10.0.nix
Tue Mar 20 23:59:09 2012 (r33319)
@@ -170,6 +170,7 @@
meta = {
description = "Mozilla Firefox - the browser, reloaded";
homepage = http://www.mozilla.com/en-US/firefox/;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
passthru = {
Copied and modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/11.0.nix (from
r33315, nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/10.0.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/10.0.nix
Tue Mar 20 23:17:45 2012 (r33315, copy source)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/firefox/11.0.nix
Tue Mar 20 23:59:09 2012 (r33319)
@@ -15,14 +15,14 @@
rec {
- firefoxVersion = "10.0.2";
+ firefoxVersion = "11.0";
- xulVersion = "10.0.2"; # this attribute is used by other packages
+ xulVersion = "11.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 = "d9b459d915d4638a48b3e249fcbaf7cafc27e834";
+ md5 = "4b07acf47857aff72776d805409cdd1b";
};
commonConfigureFlags =
@@ -170,6 +170,7 @@
meta = {
description = "Mozilla Firefox - the browser, reloaded";
homepage = http://www.mozilla.com/en-US/firefox/;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
passthru = {
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Mar 20 23:55:22
2012 (r33318)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Mar 20 23:59:09
2012 (r33319)
@@ -6625,7 +6625,7 @@
firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
- firefoxPkgs = pkgs.firefox100Pkgs;
+ firefoxPkgs = pkgs.firefox11Pkgs;
firefox36Pkgs = callPackage
../applications/networking/browsers/firefox/3.6.nix {
inherit (gnome) libIDL;
@@ -6633,23 +6633,23 @@
firefox36Wrapper = wrapFirefox { browser = firefox36Pkgs.firefox; };
- firefox90Pkgs = callPackage
../applications/networking/browsers/firefox/9.0.nix {
+ firefox9Pkgs = callPackage
../applications/networking/browsers/firefox/9.0.nix {
inherit (gnome) libIDL;
};
- firefox90Wrapper = wrapFirefox { browser = firefox90Pkgs.firefox; };
+ firefox9Wrapper = wrapFirefox { browser = firefox9Pkgs.firefox; };
- firefox100Pkgs = callPackage
../applications/networking/browsers/firefox/10.0.nix {
+ firefox10Pkgs = callPackage
../applications/networking/browsers/firefox/10.0.nix {
inherit (gnome) libIDL;
};
- firefox100Wrapper = wrapFirefox { browser = firefox100Pkgs.firefox; };
+ firefox10Wrapper = wrapFirefox { browser = firefox10Pkgs.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 { };
@@ -6663,6 +6663,7 @@
flashplayer11 = callPackage
../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
debug = getConfig ["flashplayer" "debug"] false;
+ # !!! Fix the dependency on two different builds of nss.
};
freecad = callPackage ../applications/graphics/freecad {
Modified: nixpkgs/trunk/pkgs/top-level/release.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/release.nix Tue Mar 20 23:55:22 2012
(r33318)
+++ nixpkgs/trunk/pkgs/top-level/release.nix Tue Mar 20 23:59:09 2012
(r33319)
@@ -362,8 +362,8 @@
};
firefox36Pkgs.firefox = linux;
- firefox90Pkgs.firefox = linux;
- firefox100Pkgs.firefox = linux;
+ firefox10Pkgs.firefox = linux;
+ firefox11Pkgs.firefox = linux;
gnome = {
gnome_panel = linux;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
