Unverified Commit 284b4ef9 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #253086 from bobby285271/add/mozjs115 

spidermonkey_115: init at 115.2.0
parents f185bbf8 0ab1e260

pkgs/development/interpreters/spidermonkey/115.nix

0 → 100644
+4 −0
Original line number Diff line number Diff line 
import ./common.nix {

  version = "115.2.0";

  hash = "sha512-3ztO/ZYH6OtJMnF3YMhl6zGsepYkbLQ4UZDDMxbJWV4Hk6HzxF67lnSpuk/OmNg/cbBjvvCe8wfZLRzXjTDYEg==";

}

pkgs/development/interpreters/spidermonkey/common.nix

+4 −0
Original line number Diff line number Diff line
@@ -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;

  };

})

pkgs/top-level/all-packages.nix

+3 −0
Original line number Diff line number Diff line
@@ -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 { };