diff --git a/pkgs/development/interpreters/spidermonkey/78.nix b/pkgs/development/interpreters/spidermonkey/78.nix deleted file mode 100644 index 05124a417fef..000000000000 --- a/pkgs/development/interpreters/spidermonkey/78.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "78.15.0"; - hash = "sha512-rD3nNbJGzk8OFhnNJmQyH/o3QkDOaEPnhdeaNQ3DDJZ5lrvMXjswHLPYIsqYHL6hFnWPxBIvFzjXXd/RFltjeA==="; -} diff --git a/pkgs/development/interpreters/spidermonkey/add-riscv64-support.patch b/pkgs/development/interpreters/spidermonkey/add-riscv64-support.patch deleted file mode 100644 index 9d5d7c5507dc..000000000000 --- a/pkgs/development/interpreters/spidermonkey/add-riscv64-support.patch +++ /dev/null @@ -1,123 +0,0 @@ -# HG changeset patch -# User John Paul Adrian Glaubitz -# Date 1592464269 0 -# Thu Jun 18 07:11:09 2020 +0000 -# Node ID 5de7d747a962df5f8aefc016a62d7270ac18879e -# Parent e4b11f027efc1f8c2710ae3f52487a8f10a8fb39 -Bug 1318905 - build: Add riscv64 as target architecture to mozbuild r=glandium - -Adds the basic definitions for riscv64 to mozbuild, allowing to build Spidermonkey. - -Differential Revision: https://phabricator.services.mozilla.com/D78623 - -diff -r e4b11f027efc -r 5de7d747a962 build/moz.configure/init.configure ---- a/build/moz.configure/init.configure Sun May 31 17:11:57 2020 +0000 -+++ b/build/moz.configure/init.configure Thu Jun 18 07:11:09 2020 +0000 -@@ -741,6 +741,9 @@ - elif cpu.startswith('aarch64'): - canonical_cpu = 'aarch64' - endianness = 'little' -+ elif cpu in ('riscv64', 'riscv64gc'): -+ canonical_cpu = 'riscv64' -+ endianness = 'little' - elif cpu == 'sh4': - canonical_cpu = 'sh4' - endianness = 'little' -diff -r e4b11f027efc -r 5de7d747a962 python/mozbuild/mozbuild/configure/constants.py ---- a/python/mozbuild/mozbuild/configure/constants.py Sun May 31 17:11:57 2020 +0000 -+++ b/python/mozbuild/mozbuild/configure/constants.py Thu Jun 18 07:11:09 2020 +0000 -@@ -49,6 +49,7 @@ - 'mips64': 64, - 'ppc': 32, - 'ppc64': 64, -+ 'riscv64': 64, - 's390': 32, - 's390x': 64, - 'sh4': 32, -@@ -87,6 +88,7 @@ - ('sparc', '__sparc__'), - ('mips64', '__mips64'), - ('mips32', '__mips__'), -+ ('riscv64', '__riscv && __riscv_xlen == 64'), - ('sh4', '__sh__'), - )) - -diff -r e4b11f027efc -r 5de7d747a962 python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py ---- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py Sun May 31 17:11:57 2020 +0000 -+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py Thu Jun 18 07:11:09 2020 +0000 -@@ -1208,6 +1208,10 @@ - 'mips-unknown-linux-gnu': big_endian + { - '__mips__': 1, - }, -+ 'riscv64-unknown-linux-gnu': little_endian + { -+ '__riscv': 1, -+ '__riscv_xlen': 64, -+ }, - 'sh4-unknown-linux-gnu': little_endian + { - '__sh__': 1, - }, -# HG changeset patch -# User John Paul Adrian Glaubitz -# Date 1592464269 0 -# Thu Jun 18 07:11:09 2020 +0000 -# Node ID e3d924797cb2d508ff938414168e98ccf66f07fe -# Parent 5de7d747a962df5f8aefc016a62d7270ac18879e -Bug 1318905 - js:jit: Enable AtomicOperations-feeling-lucky.h on riscv64 r=lth - -This allows the build on riscv64 to use the atomic operations provided by GCC. - -Differential Revision: https://phabricator.services.mozilla.com/D78624 - -diff -r 5de7d747a962 -r e3d924797cb2 js/src/jit/AtomicOperations.h ---- a/js/src/jit/AtomicOperations.h Thu Jun 18 07:11:09 2020 +0000 -+++ b/js/src/jit/AtomicOperations.h Thu Jun 18 07:11:09 2020 +0000 -@@ -391,7 +391,7 @@ - #elif defined(__ppc__) || defined(__PPC__) || defined(__sparc__) || \ - defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ - defined(__PPC64LE__) || defined(__alpha__) || defined(__hppa__) || \ -- defined(__sh__) || defined(__s390__) || defined(__s390x__) -+ defined(__sh__) || defined(__s390__) || defined(__s390x__) || defined(__riscv) - # include "jit/shared/AtomicOperations-feeling-lucky.h" - #else - # error "No AtomicOperations support provided for this platform" -diff -r 5de7d747a962 -r e3d924797cb2 js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h ---- a/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h Thu Jun 18 07:11:09 2020 +0000 -+++ b/js/src/jit/shared/AtomicOperations-feeling-lucky-gcc.h Thu Jun 18 07:11:09 2020 +0000 -@@ -63,6 +63,11 @@ - # define HAS_64BIT_LOCKFREE - #endif - -+#if defined(__riscv) && __riscv_xlen == 64 -+# define HAS_64BIT_ATOMICS -+# define HAS_64BIT_LOCKFREE -+#endif -+ - #ifdef __sparc__ - # ifdef __LP64__ - # define HAS_64BIT_ATOMICS -# HG changeset patch -# User John Paul Adrian Glaubitz -# Date 1592464269 0 -# Thu Jun 18 07:11:09 2020 +0000 -# Node ID 3f652d12b8bc0bd213020d488ecb4d3710bb11fa -# Parent e3d924797cb2d508ff938414168e98ccf66f07fe -Bug 1318905 - mfbt:tests: Define RETURN_INSTR for riscv64 in TestPoisonArea r=glandium - -Define RETURN_INSTR for riscv64 in TestPoisonArea, i.e. the riscv64 assembly -opcodes for "ret ; ret". - -Differential Revision: https://phabricator.services.mozilla.com/D78625 - -diff -r e3d924797cb2 -r 3f652d12b8bc mfbt/tests/TestPoisonArea.cpp ---- a/mfbt/tests/TestPoisonArea.cpp Thu Jun 18 07:11:09 2020 +0000 -+++ b/mfbt/tests/TestPoisonArea.cpp Thu Jun 18 07:11:09 2020 +0000 -@@ -132,6 +132,9 @@ - #elif defined _ARCH_PPC || defined _ARCH_PWR || defined _ARCH_PWR2 - # define RETURN_INSTR 0x4E800020 /* blr */ - -+#elif defined __riscv -+# define RETURN_INSTR 0x80828082 /* ret; ret */ -+ - #elif defined __sparc || defined __sparcv9 - # define RETURN_INSTR 0x81c3e008 /* retl */ - diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index ba6861839386..f4f0024107ba 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -50,24 +50,7 @@ stdenv.mkDerivation (finalAttrs: rec { }; patches = - lib.optionals (lib.versionOlder version "91") [ - # Fix build failure on armv7l using Debian patch - # Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526653 - (fetchpatch { - url = "https://salsa.debian.org/mozilla-team/firefox/commit/fd6847c9416f9eebde636e21d794d25d1be8791d.patch"; - hash = "sha512-K8U3Qyo7g4si2r/8kJdXyRoTrDHAY48x/YJ7YL+YBwlpfNQcHxX+EZvhRzW8FHYW+f7kOnJu9QykhE8PhSQ9zQ=="; - }) - - # Remove this when updating to 79 - The patches are already applied upstream - # https://bugzilla.mozilla.org/show_bug.cgi?id=1318905 - - # Combination of 3 changesets, modified to apply on 78: - # - https://hg.mozilla.org/mozilla-central/rev/06d7e1b6b7e7 - # - https://hg.mozilla.org/mozilla-central/rev/ec48f15d085c - # - https://hg.mozilla.org/mozilla-central/rev/6803dda74d33 - ./add-riscv64-support.patch - ] - ++ lib.optionals (lib.versionAtLeast version "102" && lib.versionOlder version "128") [ + lib.optionals (lib.versionAtLeast version "102" && lib.versionOlder version "128") [ # use pkg-config at all systems ./always-check-for-pkg-config.patch ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch @@ -95,17 +78,9 @@ stdenv.mkDerivation (finalAttrs: rec { m4 perl pkg-config - # 78 requires python up to 3.9 # 91 does not build with python 3.12: ModuleNotFoundError: No module named 'six.moves' # 102 does not build with python 3.12: ModuleNotFoundError: No module named 'distutils' - ( - if lib.versionOlder version "91" then - python39 - else if lib.versionOlder version "115" then - python311 - else - python3 - ) + (if lib.versionOlder version "115" then python311 else python3) rustc rustc.llvmPackages.llvm # for llvm-objdump which @@ -115,17 +90,13 @@ stdenv.mkDerivation (finalAttrs: rec { rust-cbindgen rustPlatform.bindgenHook ] - ++ lib.optionals (lib.versionOlder version "91") [ - autoconf213 - yasm # to buid icu? seems weird - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = [ - (if lib.versionOlder version "91" then icu67 else icu) + icu nspr readline zlib @@ -174,12 +145,6 @@ stdenv.mkDerivation (finalAttrs: rec { enableParallelBuilding = true; - # cc-rs insists on using -mabi=lp64 (soft-float) for riscv64, - # while we have a double-float toolchain - env.NIX_CFLAGS_COMPILE = lib.optionalString ( - with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91" - ) "-mabi=lp64d"; - postPatch = lib.optionalString (lib.versionOlder version "102") '' # This patch is a manually applied fix of # https://bugzilla.mozilla.org/show_bug.cgi?id=1644600 @@ -194,9 +159,6 @@ stdenv.mkDerivation (finalAttrs: rec { lib.optionalString (lib.versionAtLeast version "128") '' export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild '' - + lib.optionalString (lib.versionOlder version "91") '' - export CXXFLAGS="-fpermissive" - '' + '' export LIBXUL_DIST=$out export PYTHON="${buildPackages.python3.interpreter}" @@ -238,7 +200,7 @@ stdenv.mkDerivation (finalAttrs: rec { meta = with lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = "https://spidermonkey.dev/"; - license = licenses.mpl20; # TODO: MPL/GPL/LGPL tri-license for 78. + license = licenses.mpl20; maintainers = with maintainers; [ abbradar lostnet diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4120b6f45bdd..a3b991027466 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1312,7 +1312,8 @@ mapAliases { solana-validator = throw "'solana-validator' is obsoleted by solana-cli, which also includes the validator binary"; # Added 2024-12-20 spectral = throw "'spectral' has been renamed to/replaced by 'neochat'"; # Converted to throw 2024-10-17 # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell - spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_78'"; # Converted to throw 2024-10-17 + spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_91'"; # Converted to throw 2024-10-17 + spidermonkey_78 = throw "'spidermonkey_78' has been removed because it was unused."; # Added 2025-02-02 spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07 spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9f821c17d56..eeaa4aa1cf68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7353,9 +7353,6 @@ with pkgs; inherit ({ - spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { - inherit (darwin) libobjc; - }; spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { inherit (darwin) libobjc; }; @@ -7366,7 +7363,6 @@ with pkgs; inherit (darwin) libobjc; }; }) - spidermonkey_78 spidermonkey_91 spidermonkey_115 spidermonkey_128