diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-26 17:29:07 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-26 17:29:07 -0400 |
| commit | 2ca9fc3a32beb1b797acea8497cc0c394d5ff457 (patch) | |
| tree | 43826dc12b19876d64dedb76006a0634edb18e6d | |
| parent | 775d62748feecb2541ecda1e322ccb8743cb0e3c (diff) | |
| download | nixpkgs-2ca9fc3a32beb1b797acea8497cc0c394d5ff457.tar nixpkgs-2ca9fc3a32beb1b797acea8497cc0c394d5ff457.tar.gz nixpkgs-2ca9fc3a32beb1b797acea8497cc0c394d5ff457.tar.bz2 nixpkgs-2ca9fc3a32beb1b797acea8497cc0c394d5ff457.tar.lz nixpkgs-2ca9fc3a32beb1b797acea8497cc0c394d5ff457.tar.xz nixpkgs-2ca9fc3a32beb1b797acea8497cc0c394d5ff457.tar.zst nixpkgs-2ca9fc3a32beb1b797acea8497cc0c394d5ff457.zip | |
Make Firefox 15 the default (for realz this time)
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 1 |
2 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f18d1115a54..547f74f931d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6911,7 +6911,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox12Pkgs; + firefoxPkgs = pkgs.firefox15Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gnome) libIDL; @@ -6925,12 +6925,6 @@ let 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 { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3b0a015d6b4..0f8ea5574e3 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -359,7 +359,6 @@ with (import ./release-lib.nix); firefox36Pkgs.firefox = linux; firefox12Pkgs.firefox = linux; - firefox13Pkgs.firefox = linux; firefox15Pkgs.firefox = linux; gnome = { |