* Make Firefox 5.0 the default.

svn path=/nixpkgs/trunk/; revision=27593
This commit is contained in:
Eelco Dolstra 2011-07-04 14:04:43 +00:00
parent ce954e5a5a
commit bdf034862b
2 changed files with 7 additions and 7 deletions

View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, unzip }: { stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "chatzilla-0.9.86"; name = "chatzilla-0.9.86.1";
src = fetchurl { src = fetchurl {
# Obtained from http://chatzilla.rdmsoft.com/xulrunner/. # Obtained from http://chatzilla.rdmsoft.com/xulrunner/.
url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.86-xr.zip; url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.86.1-xr.zip;
sha256 = "1z8767arx2ncch0pzkdzhisjgmd45qianahz3xr8isvahv2klj5x"; sha256 = "06s4g0x7hsckd7wr904j8rzksvqhvcrhl9zwga2458rgafcbbghd";
}; };
buildInputs = [ unzip ]; buildInputs = [ unzip ];

View File

@ -2491,10 +2491,10 @@ let
xulrunnerWrapper = {application, launcher}: xulrunnerWrapper = {application, launcher}:
import ../development/interpreters/xulrunner/wrapper { import ../development/interpreters/xulrunner/wrapper {
inherit stdenv application launcher; inherit stdenv application launcher;
xulrunner = firefox40Pkgs.xulrunner; xulrunner = firefox50Pkgs.xulrunner;
}; };
xulrunner = firefox40Pkgs.xulrunner; xulrunner = firefox50Pkgs.xulrunner;
### DEVELOPMENT / MISC ### DEVELOPMENT / MISC
@ -6239,9 +6239,9 @@ let
filelight = newScope pkgs.kde4 ../applications/misc/filelight { }; filelight = newScope pkgs.kde4 ../applications/misc/filelight { };
firefox = firefox40Pkgs.firefox; firefox = firefox50Pkgs.firefox;
firefoxWrapper = firefox40Wrapper; firefoxWrapper = firefox50Wrapper;
firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix {
inherit (gtkLibs) gtk pango; inherit (gtkLibs) gtk pango;