diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2023-02-15 17:17:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-15 17:17:32 +0000 |
| commit | c0be31be859795e339315bd3fe29b8ae2bf03706 (patch) | |
| tree | 59762662482019854771af71b42b814be26fdb7a | |
| parent | Merge pull request #216482 from alyssais/linux-2023-02-14 (diff) | |
| parent | spidermonkey_91: 91.12.0 -> 91.13.0 (diff) | |
| download | nixpkgs-c0be31be859795e339315bd3fe29b8ae2bf03706.tar.gz | |
Merge pull request #216490 from NixOS/backport-216356-to-release-22.11
[Backport release-22.11] spidermonkey_102: 102.1.0 -> 102.8.0; spidermonkey_91: 91.12.0 0 -> 91.13.0
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/102.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/91.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/spidermonkey/common.nix | 13 |
3 files changed, 4 insertions, 17 deletions
diff --git a/pkgs/development/interpreters/spidermonkey/102.nix b/pkgs/development/interpreters/spidermonkey/102.nix index ef89d1ca0a27..ff6808b13b0a 100644 --- a/pkgs/development/interpreters/spidermonkey/102.nix +++ b/pkgs/development/interpreters/spidermonkey/102.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "102.1.0"; - hash = "sha512-JQW4fOQRVEVWjra32K9BZ4vXh/0H8/eenwoi2QzfdSrl1DcYVs+cVuLZ2n1bfDk53CqrV1P8wBc5jn1lJg9vAw=="; + version = "102.8.0"; + hash = "sha512-k+qHmXtmCIuUxulDtumemnHRkIRE0JbA9ltodtLFhOVf9hICZvOFH5hrZkvR8S+jEgawNHnCt1Hnw8oJesFCdQ=="; } diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix index ca771fa75fd6..0ffa5fc287d5 100644 --- a/pkgs/development/interpreters/spidermonkey/91.nix +++ b/pkgs/development/interpreters/spidermonkey/91.nix @@ -1,4 +1,4 @@ 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=="; } diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index d12396396da4..d11b807f555c 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -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 |