Make Firefox 15 the default (for realz this time)

This commit is contained in:
Eelco Dolstra 2012-09-26 17:29:07 -04:00
parent 775d62748f
commit 2ca9fc3a32
2 changed files with 1 additions and 8 deletions

View File

@ -6911,7 +6911,7 @@ let
firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
firefoxPkgs = pkgs.firefox12Pkgs; firefoxPkgs = pkgs.firefox15Pkgs;
firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
inherit (gnome) libIDL; inherit (gnome) libIDL;
@ -6925,12 +6925,6 @@ let
firefox12Wrapper = wrapFirefox { browser = firefox12Pkgs.firefox; }; firefox12Wrapper = wrapFirefox { browser = firefox12Pkgs.firefox; };
firefox13Pkgs = callPackage ../applications/networking/browsers/firefox/13.0.nix {
inherit (gnome) libIDL;
};
firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; });
firefox15Pkgs = callPackage ../applications/networking/browsers/firefox/15.0.nix { firefox15Pkgs = callPackage ../applications/networking/browsers/firefox/15.0.nix {
inherit (gnome) libIDL; inherit (gnome) libIDL;
inherit (pythonPackages) pysqlite; inherit (pythonPackages) pysqlite;

View File

@ -359,7 +359,6 @@ with (import ./release-lib.nix);
firefox36Pkgs.firefox = linux; firefox36Pkgs.firefox = linux;
firefox12Pkgs.firefox = linux; firefox12Pkgs.firefox = linux;
firefox13Pkgs.firefox = linux;
firefox15Pkgs.firefox = linux; firefox15Pkgs.firefox = linux;
gnome = { gnome = {