diff options
author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-11-01 08:31:54 +0100 |
---|---|---|
committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-11-01 08:31:54 +0100 |
commit | 609f8dc04b4604124e742bb114af9377d203a4cc (patch) | |
tree | 096dc9b70379e449392b557fb1d9b3e0faf53258 /pkgs/applications/networking/browsers/firefox/default.nix | |
parent | b60d44a00a9218eccf1190bcc6bbb6ec929358d9 (diff) | |
parent | b6519f08da3321a8bc002e6608297a3225cc5439 (diff) | |
download | nixlib-609f8dc04b4604124e742bb114af9377d203a4cc.tar nixlib-609f8dc04b4604124e742bb114af9377d203a4cc.tar.gz nixlib-609f8dc04b4604124e742bb114af9377d203a4cc.tar.bz2 nixlib-609f8dc04b4604124e742bb114af9377d203a4cc.tar.lz nixlib-609f8dc04b4604124e742bb114af9377d203a4cc.tar.xz nixlib-609f8dc04b4604124e742bb114af9377d203a4cc.tar.zst nixlib-609f8dc04b4604124e742bb114af9377d203a4cc.zip |
Merge branch 'master' into stdenv-updates
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/default.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 8375bcdad3df..45606c9af825 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -18,9 +18,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; let optional = stdenv.lib.optional; in rec { - firefoxVersion = "24.0"; + firefoxVersion = "25.0"; - xulVersion = "24.0"; # this attribute is used by other packages + xulVersion = "25.0"; # this attribute is used by other packages src = fetchurl { @@ -28,9 +28,9 @@ in rec { # It is better to use this url for official releases, to take load off Mozilla's ftp server. "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" # Fall back to this url for versions not available at releases.mozilla.org. - "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" + "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2" ]; - sha1 = "8scch0gr59j86vp9c1v0yx6mq1pkwcvg"; + sha1 = "854722e283659d2b6b2eacd38f757b3c5b63a448"; }; commonConfigureFlags = |