git.iko.soy/typeable/nixpkgs
on master help sign in
spidermonkey_1_8_5: drop
commit09d29bd784d05ef2ae69df150a6cb4306133a017 authorajs124 <git@ajs124.de> dateWed 3 Mar 2021, 02:32 (6 years ago) parent891a83d
3 files changed+1−80
pkgs/development/interpreters/spidermonkey/1.8.5.nix−79 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix−1
pkgs/development/interpreters/spidermonkey/1.8.5.nixdeleted−79
@@ -1,79 +0,0 @@
1−{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkg-config, nspr, perl, python2, zip }:
2−
3−stdenv.mkDerivation {
4− pname = "spidermonkey";
5− version = "1.8.5";
6−
7− src = fetchurl {
8− url = "mirror://mozilla/js/js185-1.0.0.tar.gz";
9− sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687";
10− };
11−
12− propagatedBuildInputs = [ nspr ];
13−
14− nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isAarch32 autoconf213;
15− buildInputs = [ perl python2 zip ];
16−
17− postUnpack = "sourceRoot=\${sourceRoot}/js/src";
18−
19− preConfigure = ''
20− export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
21− export LIBXUL_DIST=$out
22− ${lib.optionalString stdenv.isAarch32 "autoreconf --verbose --force"}
23− '';
24−
25− patches = [
26− (fetchpatch {
27− name = "gcc6.patch";
28− url = "https://sources.debian.org/data/main/m/mozjs/1.8.5-1.0.0+dfsg-6/debian/patches/fix-811665.patch";
29− sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99";
30− })
31− ] ++ lib.optionals stdenv.isAarch32 [
32− # Explained below in configureFlags for ARM
33− ./1.8.5-findvanilla.patch
34− # Fix for hard float flags.
35− ./1.8.5-arm-flags.patch
36− ];
37−
38− patchFlags = [ "-p3" ];
39−
40− # fixes build on gcc8
41− postPatch = ''
42− substituteInPlace ./methodjit/MethodJIT.cpp \
43− --replace 'asm volatile' 'asm'
44− '';
45−
46− # On the Sheevaplug, ARM, its nanojit thing segfaults in japi-tests in
47− # "make check". Disabling tracejit makes it work, but then it needs the
48− # patch findvanilla.patch do disable a checker about allocator safety. In case
49− # of polkit, which is what matters most, it does not override the allocator
50− # so the failure of that test does not matter much.
51− configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++
52− lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [
53− "--with-cpu-arch=armv5t"
54− "--disable-tracejit" ];
55−
56− # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
57− preBuild = ''
58− touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}
59− ${if stdenv.isAarch32 then "rm -r jit-test/tests/jaeger/bug563000" else ""}
60− '';
61−
62− enableParallelBuilding = true;
63−
64− doCheck = true;
65−
66− preCheck = ''
67− rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522
68− '';
69−
70− meta = with lib; {
71− description = "Mozilla's JavaScript engine written in C/C++";
72− homepage = "https://developer.mozilla.org/en/SpiderMonkey";
73− # TODO: MPL/GPL/LGPL tri-license.
74− maintainers = [ maintainers.goibhniu ];
75− platforms = platforms.linux;
76− broken = stdenv.isAarch64; # 2018-08-21, broken since 2017-03-08
77− };
78−}
79−
pkgs/top-level/aliases.nix+1
@@ -745,6 +745,7 @@ mapAliases ({
745745 speedtest_cli = speedtest-cli; # added 2015-02-17
746746 spice_gtk = spice-gtk; # added 2018-02-25
747747 spice_protocol = spice-protocol; # added 2018-02-25
748+ spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011."; # added 2021-05-03
748749 spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21
749750 spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # added 2019-10-16
750751 spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21
pkgs/top-level/all-packages.nix−1
@@ -12185,7 +12185,6 @@ in
1218512185
1218612186 sparkleshare = callPackage ../applications/version-management/sparkleshare { };
1218712187
12188− spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
1218912188 spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { };
1219012189 spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { };
1219112190