Merge branch 'master' into staging

There have been some larger security rebuilds on master.
This commit is contained in:
Vladimír Čunát
2017-02-01 15:56:35 +01:00
100 changed files with 2444 additions and 1668 deletions
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Mozilla's JavaScript engine written in C/C++";
homepage = https://developer.mozilla.org/en/SpiderMonkey;
homepage = "https://developer.mozilla.org/en/SpiderMonkey";
# TODO: MPL/GPL/LGPL tri-license.
maintainers = [ maintainers.abbradar ];