Merge pull request #253086 from bobby285271/add/mozjs115

spidermonkey_115: init at 115.2.0
This commit is contained in:
Martin Weinelt 2023-09-03 13:12:52 +02:00 committed by GitHub
commit 284b4ef9f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions

View file

@ -0,0 +1,4 @@
import ./common.nix {
version = "115.2.0";
hash = "sha512-3ztO/ZYH6OtJMnF3YMhl6zGsepYkbLQ4UZDDMxbJWV4Hk6HzxF67lnSpuk/OmNg/cbBjvvCe8wfZLRzXjTDYEg==";
}

View file

@ -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;
};
})

View file

@ -18253,6 +18253,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 { };