summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-23 15:34:32 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-07-23 17:28:36 +0200
commit21c7ed54e3617d5561d5ff4c72a8c7505fdce060 (patch)
tree2803886a478718ee34a4b687cbb3ba46ea929498
parentea0013a0d9d5a6e7b5cda8a1d6f4dc7c0b20df6e (diff)
downloadnixlib-21c7ed54e3617d5561d5ff4c72a8c7505fdce060.tar
nixlib-21c7ed54e3617d5561d5ff4c72a8c7505fdce060.tar.gz
nixlib-21c7ed54e3617d5561d5ff4c72a8c7505fdce060.tar.bz2
nixlib-21c7ed54e3617d5561d5ff4c72a8c7505fdce060.tar.lz
nixlib-21c7ed54e3617d5561d5ff4c72a8c7505fdce060.tar.xz
nixlib-21c7ed54e3617d5561d5ff4c72a8c7505fdce060.tar.zst
nixlib-21c7ed54e3617d5561d5ff4c72a8c7505fdce060.zip
firefox: Update to 31.0
Also boldly re-enable parallel building.
-rw-r--r--pkgs/applications/networking/browsers/firefox/default.nix8
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 1e2c3e2cfb19..00921220fb07 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -17,14 +17,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "30.0";
+  firefoxVersion = "31.0";
 
-  xulVersion = "30.0"; # this attribute is used by other packages
+  xulVersion = "31.0"; # this attribute is used by other packages
 
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "bll9hxf31gvg9db6gxgmq25qsjif3p11";
+    sha1 = "a6c3e25ee3aeb7da42db2aaeb50a385d63532beb";
   };
 
   commonConfigureFlags =
@@ -78,7 +78,7 @@ rec {
         "--disable-javaxpcom"
       ] ++ commonConfigureFlags;
 
-    #enableParallelBuilding = true; # cf. https://github.com/NixOS/nixpkgs/pull/1699#issuecomment-35196282
+    enableParallelBuilding = true;
 
     preConfigure =
       ''