Merge branch 'master' into staging

This commit is contained in:
Vladimír Čunát
2016-05-12 04:03:33 +02:00
222 changed files with 17737 additions and 11667 deletions

View File

@@ -3,7 +3,7 @@
variant ? "jit", buildWithPypy ? false }:
let
commit-count = "1333";
commit-count = "1352";
common-flags = "--thread --gcrootfinder=shadowstack --continuation";
variants = {
jit = { flags = "--opt=jit"; target = "target.py"; };
@@ -13,8 +13,8 @@ let
};
pixie-src = fetchgit {
url = "https://github.com/pixie-lang/pixie.git";
rev = "36ce07e1cd85ca82eedadf366bef3bb57a627a2a";
sha256 = "1b3v99c0is33w029r15qvd0mkrc5n1mrvjjmfpcd9yvhvqb2vcjs";
rev = "dd754fe9f329e9e176eeaedae1095c85cde65028";
sha256 = "1jf3nkd1jzvxrw9ql2r74drsirrxfihc125x0wmk45jyl5q24vdd";
};
pypy-tag = "81254";
pypy-src = fetchurl {

View File

@@ -3,9 +3,9 @@
stdenv.mkDerivation rec {
version = "1.8.0-rc1";
name = "spidermonkey-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/js/js-${version}.tar.gz";
url = "mirror://mozilla/js/js-${version}.tar.gz";
sha256 = "374398699ac3fd802d98d642486cf6b0edc082a119c9c9c499945a0bc73e3413";
};

View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
name = "spidermonkey-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/js/mozjs${version}.tar.gz";
url = "mirror://mozilla/js/mozjs${version}.tar.gz";
sha256 = "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij";
};

View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
name = "spidermonkey-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/js/js${version}.tar.gz";
url = "mirror://mozilla/js/js${version}.tar.gz";
sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687";
};

View File

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
name = "spidermonkey-${version}";
src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/js/mozjs-${version}.tar.bz2";
url = "mirror://mozilla/js/mozjs-${version}.tar.bz2";
sha256 = "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6";
};

View File

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "spidermonkey-1.7";
src = fetchurl {
url = https://ftp.mozilla.org/pub/js/js-1.7.0.tar.gz;
url = mirror://mozilla/js/js-1.7.0.tar.gz;
sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4";
};