Merge branch 'master' into gcc-6

2017-08-12 10:09:41 +02:00
parent 9bcee1051a e207d1f04a
commit 6899c7fdb9
2362 changed files with 36299 additions and 29476 deletions
--- a/pkgs/development/interpreters/spidermonkey/38.nix
+++ b/pkgs/development/interpreters/spidermonkey/38.nix
@@ -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 ];