From b63df3f2e066a3e1d1f6438a3375298151ca00fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 13 Dec 2018 12:42:05 +0100 Subject: [PATCH] spidermonkey_{17,31}: remove No longer in use. --- .../interpreters/spidermonkey/17.nix | 88 ------------------- .../interpreters/spidermonkey/31.nix | 64 -------------- pkgs/top-level/all-packages.nix | 5 -- 3 files changed, 157 deletions(-) delete mode 100644 pkgs/development/interpreters/spidermonkey/17.nix delete mode 100644 pkgs/development/interpreters/spidermonkey/31.nix diff --git a/pkgs/development/interpreters/spidermonkey/17.nix b/pkgs/development/interpreters/spidermonkey/17.nix deleted file mode 100644 index e2eef0fab695..000000000000 --- a/pkgs/development/interpreters/spidermonkey/17.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi -, enableReadline ? (!stdenv.isDarwin), readline -, libobjc }: - -stdenv.mkDerivation rec { - version = "17.0.0"; - name = "spidermonkey-${version}"; - - src = fetchurl { - url = "mirror://mozilla/js/mozjs${version}.tar.gz"; - sha256 = "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij"; - }; - - outputs = [ "out" "dev" "lib" ]; - - propagatedBuildInputs = [ nspr ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ perl python2 zip libffi readline ] - ++ stdenv.lib.optional enableReadline readline - ++ stdenv.lib.optional stdenv.isDarwin libobjc; - - postUnpack = "sourceRoot=\${sourceRoot}/js/src"; - - patches = [ - (fetchurl { - name = "jsoptparse-gcc7.patch"; - url = "https://src.fedoraproject.org/cgit/rpms/mozjs17.git/plain/" - + "mozjs17.0.0-gcc7.patch?id=43b846629a299f"; - sha256 = "17plyaq0jwf9wli4zlgvh4ri3zyk6nj1fiakh3wnd37nsl90raf9"; - }) - ]; - patchFlags = "-p3"; - - postPatch = '' - # Fixes an issue with version detection under perl 5.22.x - sed -i 's/(defined\((@TEMPLATE_FILE)\))/\1/' config/milestone.pl - '' + stdenv.lib.optionalString stdenv.isAarch64 '' - patch -p1 -d ../.. < ${./aarch64-double-conversion.patch} - patch -p1 -d ../.. < ${./aarch64-48bit-va-fix.patch} - ''; - - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" - export LIBXUL_DIST=$out - ''; - - setOutputFlags = false; - configureFlags = [ - "--libdir=$(lib)/lib" - "--includedir=$(dev)/include" - "--enable-threadsafe" - "--with-system-nspr" - "--with-system-ffi" - (if enableReadline then "--enable-readline" else "--disable-readline") - ]; - - # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393 - preBuild = "touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}"; - - enableParallelBuilding = true; - - doCheck = true; - preCheck = '' - rm jit-test/tests/sunspider/check-date-format-tofte.js # https://bugzil.la/600522 - - # Test broken on ARM. Fedora disables it. - # https://lists.fedoraproject.org/pipermail/scm-commits/Week-of-Mon-20130617/1041155.html - echo -e '#!${stdenv.shell}\nexit 0' > config/find_vanilla_new_calls - - '' + stdenv.lib.optionalString stdenv.isLinux '' - paxmark m shell/js17 - paxmark mr jsapi-tests/jsapi-tests - ''; - - postInstall = '' - rm "$lib"/lib/*.a # halve the output size - moveToOutput "bin/js*-config" "$dev" # break the cycle - ''; - - meta = with stdenv.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.unix; - }; -} diff --git a/pkgs/development/interpreters/spidermonkey/31.nix b/pkgs/development/interpreters/spidermonkey/31.nix deleted file mode 100644 index e64ab1b39a7c..000000000000 --- a/pkgs/development/interpreters/spidermonkey/31.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, nspr, icu, readline }: - -stdenv.mkDerivation rec { - version = "31.5.0"; - name = "spidermonkey-${version}"; - - # the release notes point to some guys home directory, see - # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/31 - # probably it would be more ideal to pull a particular tag/revision - # from the mercurial repo - src = fetchurl { - url = "https://people.freebsd.org/~sunpoet/sunpoet/mozjs-31.5.0.tar.bz2"; - sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd"; - }; - - buildInputs = [ libffi readline nspr icu ]; - nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ]; - - postUnpack = "sourceRoot=\${sourceRoot}/js/src"; - - preConfigure = '' - export CXXFLAGS="-fpermissive" - export LIBXUL_DIST=$out - ''; - - configureFlags = [ - "--enable-threadsafe" - "--with-system-ffi" - "--with-system-nspr" - "--with-system-icu" - "--enable-readline" - - # enabling these because they're wanted by 0ad. They may or may - # not be good defaults for other uses. - "--enable-gcgenerational" - "--enable-shared-js" - - # Due to a build-system bug, this means the exact opposite of what it says. - # It is required by gcgenerational. - "--disable-exact-rooting" - ]; - - # This addresses some build system bug. It's quite likely to be safe - # to re-enable parallel builds if the source revision changes. - enableParallelBuilding = false; - - postFixup = '' - # The headers are symlinks to a directory that doesn't get put - # into $out, so they end up broken. Fix that by just resolving the - # symlinks. - for i in $(find $out -type l); do - cp --remove-destination "$(readlink "$i")" "$i"; - done - ''; - - meta = with stdenv.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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d88ff07330c..f8cc825d6eb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8091,11 +8091,6 @@ in spark_22 = callPackage ../applications/networking/cluster/spark { version = "2.2.1"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; - spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { - inherit (darwin) libobjc; - stdenv = gccStdenv; - }; - spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {