summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pkgs/development/interpreters/spidermonkey/115.nix4
-rw-r--r--pkgs/development/interpreters/spidermonkey/common.nix4
-rw-r--r--pkgs/top-level/all-packages.nix3
3 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/115.nix b/pkgs/development/interpreters/spidermonkey/115.nix
new file mode 100644
index 000000000000..433a16f5da2e
--- /dev/null
+++ b/pkgs/development/interpreters/spidermonkey/115.nix
@@ -0,0 +1,4 @@
+import ./common.nix {
+ version = "115.2.0";
+ hash = "sha512-3ztO/ZYH6OtJMnF3YMhl6zGsepYkbLQ4UZDDMxbJWV4Hk6HzxF67lnSpuk/OmNg/cbBjvvCe8wfZLRzXjTDYEg==";
+}
diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index 244a699fd54b..5beac058eb90 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -157,10 +157,13 @@ stdenv.mkDerivation (finalAttrs: rec {
export AS=$CC
export AC_MACRODIR=$PWD/build/autoconf/
+ '' + lib.optionalString (lib.versionAtLeast version "91" && lib.versionOlder version "115") ''
pushd js/src
sh ../../build/autoconf/autoconf.sh --localdir=$PWD configure.in > configure
chmod +x configure
popd
+ '' + lib.optionalString (lib.versionAtLeast version "115") ''
+ patchShebangs build/cargo-linker
'' + ''
# We can't build in js/src/, so create a build dir
mkdir obj
@@ -184,6 +187,7 @@ stdenv.mkDerivation (finalAttrs: rec {
homepage = "https://spidermonkey.dev/";
license = licenses.mpl20; # TODO: MPL/GPL/LGPL tri-license for 78.
maintainers = with maintainers; [ abbradar lostnet catap ];
+ broken = stdenv.isDarwin && versionAtLeast version "115"; # Requires SDK 13.3 (see #242666).
platforms = platforms.unix;
};
})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e23480a1a37..edd41602e613 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18235,6 +18235,9 @@ with pkgs;
spidermonkey_102 = callPackage ../development/interpreters/spidermonkey/102.nix {
inherit (darwin) libobjc;
};
+ spidermonkey_115 = callPackage ../development/interpreters/spidermonkey/115.nix {
+ inherit (darwin) libobjc;
+ };
ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };
ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { };