diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix deleted file mode 100644 index 4892e0b8abef..000000000000 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkg-config, nspr, perl, python2, zip }: - -stdenv.mkDerivation { - pname = "spidermonkey"; - version = "1.8.5"; - - src = fetchurl { - url = "mirror://mozilla/js/js185-1.0.0.tar.gz"; - sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687"; - }; - - propagatedBuildInputs = [ nspr ]; - - nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isAarch32 autoconf213; - buildInputs = [ perl python2 zip ]; - - postUnpack = "sourceRoot=\${sourceRoot}/js/src"; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" - export LIBXUL_DIST=$out - ${lib.optionalString stdenv.isAarch32 "autoreconf --verbose --force"} - ''; - - patches = [ - (fetchpatch { - name = "gcc6.patch"; - url = "https://sources.debian.org/data/main/m/mozjs/1.8.5-1.0.0+dfsg-6/debian/patches/fix-811665.patch"; - sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99"; - }) - ] ++ lib.optionals stdenv.isAarch32 [ - # Explained below in configureFlags for ARM - ./1.8.5-findvanilla.patch - # Fix for hard float flags. - ./1.8.5-arm-flags.patch - ]; - - patchFlags = [ "-p3" ]; - - # fixes build on gcc8 - postPatch = '' - substituteInPlace ./methodjit/MethodJIT.cpp \ - --replace 'asm volatile' 'asm' - ''; - - # On the Sheevaplug, ARM, its nanojit thing segfaults in japi-tests in - # "make check". Disabling tracejit makes it work, but then it needs the - # patch findvanilla.patch do disable a checker about allocator safety. In case - # of polkit, which is what matters most, it does not override the allocator - # so the failure of that test does not matter much. - configureFlags = [ "--enable-threadsafe" "--with-system-nspr" ] ++ - lib.optionals (stdenv.hostPlatform.system == "armv5tel-linux") [ - "--with-cpu-arch=armv5t" - "--disable-tracejit" ]; - - # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 - preBuild = '' - touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl} - ${if stdenv.isAarch32 then "rm -r jit-test/tests/jaeger/bug563000" else ""} - ''; - - enableParallelBuilding = true; - - doCheck = true; - - preCheck = '' - rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522 - ''; - - meta = with lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = "https://developer.mozilla.org/en/SpiderMonkey"; - # TODO: MPL/GPL/LGPL tri-license. - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - broken = stdenv.isAarch64; # 2018-08-21, broken since 2017-03-08 - }; -} - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d10ed004cbc..7ba7838a986a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -745,6 +745,7 @@ mapAliases ({ speedtest_cli = speedtest-cli; # added 2015-02-17 spice_gtk = spice-gtk; # added 2018-02-25 spice_protocol = spice-protocol; # added 2018-02-25 + 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 spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21 spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # added 2019-10-16 spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8c23f6d0272..7ce3ccd4019c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12185,7 +12185,6 @@ in sparkleshare = callPackage ../applications/version-management/sparkleshare { }; - spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { }; spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { };