Unverified Commit 05fe3be9 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #216356 from mweinelt/spidermonkeys 

spidermonkey_102: 102.1.0 -> 102.8.0; spidermonkey_91: 91.12.0 0 -> 91.13.0
parents a68a8869 2b4f446e

pkgs/development/interpreters/spidermonkey/102.nix

+2 −2
Original line number Diff line number Diff line 
import ./common.nix {

  version = "102.1.0";

  hash = "sha512-JQW4fOQRVEVWjra32K9BZ4vXh/0H8/eenwoi2QzfdSrl1DcYVs+cVuLZ2n1bfDk53CqrV1P8wBc5jn1lJg9vAw==";

  version = "102.8.0";

  hash = "sha512-k+qHmXtmCIuUxulDtumemnHRkIRE0JbA9ltodtLFhOVf9hICZvOFH5hrZkvR8S+jEgawNHnCt1Hnw8oJesFCdQ==";

}

pkgs/development/interpreters/spidermonkey/91.nix

+2 −2
Original line number Diff line number Diff line 
import ./common.nix {

  version = "91.12.0";

  hash = "sha512-Mj+3UkiLRYcrQPCw7h2MHf+haHTb/yr94ZpUKGyCTvSBdyM+Ap+ur6WUYYTnHDHGvFun7BelceIa9k/F9zNAQg==";

  version = "91.13.0";

  hash = "sha512-OLTMUt4h521gYea6F14cv9iIoWBwqpUfWkQoPy251+lPJQRiHw2nj+rG5xSRptDnA49j3QrhEtytcA6wLpqlFg==";

}

pkgs/development/interpreters/spidermonkey/common.nix

+0 −13
Original line number Diff line number Diff line
@@ -62,19 +62,6 @@ stdenv.mkDerivation (finalAttrs: rec { 
    # use pkg-config at all systems

    ./always-check-for-pkg-config.patch

    ./allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch



    # Patches required by GJS

    # https://discourse.gnome.org/t/gnome-43-to-depend-on-spidermonkey-102/10658

    # Install ProfilingCategoryList.h

    (fetchpatch {

      url = "https://hg.mozilla.org/releases/mozilla-esr102/raw-rev/33147b91e42b79f4c6dd3ec11cce96746018407a";

      sha256 = "sha256-xJFJZMYJ6P11HQDZbr48GFgybpAeVcu3oLIFEyyMjBI=";

    })

    # Fix embeder build

    (fetchpatch {

      url = "https://hg.mozilla.org/releases/mozilla-esr102/raw-rev/1fa20fb474f5d149cc32d98df169dee5e6e6861b";

      sha256 = "sha256-eCisKjNxy9SLr9KoEE2UB26BflUknnR7PIvnpezsZeA=";

    })

  ] ++ lib.optionals (lib.versionAtLeast version "91" && stdenv.hostPlatform.system == "i686-linux") [

    # Fixes i686 build, https://bugzilla.mozilla.org/show_bug.cgi?id=1729459

    ./fix-float-i686.patch