Commit Graph

189 Commits

Author SHA1 Message Date
Alyssa Ross
b33fd42c30 pkgsMusl.spidermonkey: fix build on x86_64-linux
rustc 1.73.0 introduced a new x86_64-unikraft-linux-musl target.  This
triple is a bit of a lie — the kernel in this case is unikraft, which
isn't Linux, it just tries to be compatible with it.  But this
User-Agent-like string of a triple now exists, and with it comes some
fallout.

Spidermonkey asks rustc for the list of supported targets, then picks
the one that best matches the GNU triple it's building for, which in
the native case config.guess will say is x86_64-pc-linux-musl.  Prior
to rustc 1.73.0, all was well, because there was only one x86_64 musl
triple, but now there are two: x86_64-unknown-linux-musl, and
x86_64-unikraft-linux-musl, and neither of those are obviously closer
than the other to x86_64-pc-linux-musl to Spidermonkey's build system.
As a result, it can't decide which target to pass to rustc, and bails
out.

We can fix this by telling Spidermonkey what platform it should be
building for, rather than letting it guess, which previously we did
only when cross compiling.  This approach is already used in the
Firefox derivation (which is why it was not affected by the rustc
update), so it's been well tested already.

Closes: https://github.com/NixOS/nixpkgs/pull/266560
Closes: https://github.com/NixOS/nixpkgs/pull/282923
2024-02-01 15:36:20 +01:00
Morgan Helton
ecbdec62a3 spidermonkey_91: add patch to allow building with python311 2023-10-29 12:40:56 -05:00
Bobby Rong
0ab1e26024
spidermonkey_115: init at 115.2.0
Based on https://src.fedoraproject.org/rpms/mozjs115.

* js/src/configure.in is gone.
* build/cargo-linker is ported to python.
2023-09-03 18:28:07 +08:00
Martin Weinelt
31bbf919d3
spidermonkey_102: 102.12.0 -> 102.13.0
https://www.mozilla.org/en-US/security/advisories/mfsa2023-23/

Fixes: CVE-2023-37202
2023-07-04 16:28:47 +02:00
Martin Weinelt
968e2acec5
spidermonkey_102: 102.8.0 -> 102.12.0 2023-06-14 18:20:03 +02:00
Weijia Wang
11b07d930d firefox, spidermonkey: remove NIX_LDFLAGS
This commit reverts #210859, since aarch64-linux now uses GCC 12 by default.
2023-03-02 08:02:06 +02:00
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Martin Weinelt
2b4f446ee8
spidermonkey_91: 91.12.0 -> 91.13.0
Bringing the 91 release series to its final version. Did not check for
changes, but this gives me closure.
2023-02-14 19:31:55 +01:00
Martin Weinelt
f7eba3716c
spidermonkey_102: 102.1.0 -> 102.8.0
https://www.mozilla.org/en-US/security/advisories/mfsa2023-06/#CVE-2023-25735

Fixes: CVE-2023-25735
2023-02-14 19:30:20 +01:00
Weijia Wang
52a28708b8 treewide: mark #201254 2023-01-26 15:11:41 +01:00
Vladimír Čunát
77a214e764
spidermonkey: fixup build on aarch64-linux
All three versions are the same in this respect.
It's the issue with old libgcc_s propagated via our glibc package; e.g.
https://github.com/NixOS/nixpkgs/pull/209113
2023-01-13 10:03:32 +01:00
Artturin
7e49471316 treewide: optional -> optionals where the argument is a list
the argument to optional should not be list
2022-10-10 15:40:21 +03:00
sg2002
49a6efa32a spidermonkey: fix i686 build 2022-09-25 16:12:45 +03:00
Kirill A. Korinsky
60259663a4 spidermonkey_*: fix build under macOS 2022-08-10 23:33:20 +02:00
Kirill A. Korinsky
f6c8d04c78 spidermonkey_*: remove useless dependency 2022-08-10 23:33:20 +02:00
Kirill A. Korinsky
cf3859b188 spidermonkey_*: add myself as a maintainer 2022-08-10 23:33:20 +02:00
Kirill A. Korinsky
c053cde6be spidermonkey_102: init at 102.1.0 2022-08-10 23:33:20 +02:00
Kirill A. Korinsky
457b124ad2 spidermonkey_*: add tests 2022-08-10 23:33:20 +02:00
Kirill A. Korinsky
9a99e98ea4 spidermonkey_78: factor out into a common expression 2022-08-10 23:33:20 +02:00
Kirill A. Korinsky
1573bc9229 spidermonkey_91: factor out into a common expression 2022-08-10 23:33:20 +02:00
Martin Weinelt
d361a9f90a
spidermonkey_91: 91.11.0 -> 91.12.0 2022-07-26 15:05:13 +02:00
Martin Weinelt
d3d7ea1ace
spidermonkey_91: 91.10.0 -> 91.11.0 2022-06-27 14:20:48 +02:00
Martin Weinelt
a15f7ddc28
spidermonkey_78: pin python39
Because the configure script hasn't been update to work with Python 3.10
and never will. Spidermonkey 78 is EOL.

Traceback (most recent call last):
  File "/build/firefox-78.15.0/obj/../js/src/../../configure.py", line 25, in <module>
    from mozbuild.configure import (
  File "/build/firefox-78.15.0/python/mozbuild/mozbuild/configure/__init__.py", line 33, in <module>
    from mozbuild.util import (
  File "/build/firefox-78.15.0/python/mozbuild/mozbuild/util.py", line 760, in <module>
    class HierarchicalStringList(object):
  File "/build/firefox-78.15.0/python/mozbuild/mozbuild/util.py", line 785, in HierarchicalStringList
    class StringListAdaptor(collections.Sequence):
AttributeError: module 'collections' has no attribute 'Sequence'
2022-06-06 11:46:07 -07:00
Martin Weinelt
78ffb8f7ae
spidermonkey_91: 91.9.1 -> 91.10.0 2022-05-31 16:34:39 +02:00
Martin Weinelt
814a08cdfb
Merge pull request #173810 from mweinelt/spidermonkey
spidermonkey_91: unpin icu, drop yasm, refactor
2022-05-22 11:57:53 +02:00
Martin Weinelt
71e22b76fc
spidermonkey_91: unpin icu, drop yasm, refactor
Split the argument list into build and runtime dependencies and sort
everything alphabetically.

Unpin icu, it works with icu70, which is the latest version at this
time.

Remove yasm, it's not needed in firefox either.
2022-05-21 00:09:15 +02:00
Martin Weinelt
ba2e66efd1
spidermonkey_91: 91.9.0 -> 91.9.1
https://www.mozilla.org/en-US/security/advisories/mfsa2022-19/

Fixes: CVE-2022-1802, CVE-2022-1529
2022-05-20 23:45:32 +02:00
Will
bbb27f8eb3 spidermonkey_91: 91.8.0 -> 91.9.0 2022-05-10 13:01:01 +00:00
Will
7979a1b294 spidermonkey_91: 91.7.0 -> 91.8.0 2022-04-07 08:44:04 +00:00
Alyssa Ross
3ff5f0eb76 spidermonkey: use the same LLVM as rustc
Spidermonkey depends on rustc, so we have the best chance at only
having a single LLVM in the build closure if we use the same LLVM that
rustc depends on.
2022-03-22 20:40:54 +00:00
Will Young
acb148bd32 spidermonkey_91: 91.6.0 -> 91.7.0 2022-03-09 19:38:34 +01:00
Will
3e75cee198 spidermonkey_91: 91.5.0 -> 91.6.0 2022-02-09 08:59:17 +00:00
R. Ryantm
1fdd3a53ad spidermonkey_91: 91.5.0 -> 91.5.1 2022-02-04 19:03:28 -08:00
Jörg Thalheim
46481f3081 spidermonkey_68: drop 2022-02-02 18:57:16 +01:00
Dmitry Kalinkin
a56da82f7a
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/restfly/default.nix
2022-01-13 21:39:05 -05:00
Will
adfc569e05 spidermonkey_91: 91.4.0 -> 91.5.0 2022-01-13 13:17:12 +00:00
Zhaofeng Li
2303031e51 spidermonkey: Force lp64d ABI for riscv64
cc-rs is hardcoded to use the soft-float ABI for riscv64, while
the rest of the system is double-float. This is not just a missing
stub header file - You can't link object files using different
ABIs.
2022-01-10 11:10:51 -08:00
Zhaofeng Li
ef4fe46f17 spidermonkey: Add patch to support riscv64 2022-01-10 11:09:56 -08:00
Joerie de Gram
24b26ce79e spidermonkey_91: fix cross compilation
The configurePlatforms mkDerivation parameter needs to be an empty list
to avoid bogus defaults from breaking cross compilation.

Document the parameter to prevent it from being cleaned up.
2021-12-30 14:54:30 +01:00
Will
e9876058d2 spidermonkey_91: 91.3.0 -> 91.4.0 2021-12-08 15:39:20 +00:00
Janne Heß
7e85727661
Merge pull request #144953 from helsinki-systems/upd/spidermonkey-78
spidermonkey_78: 78.11.0 -> 78.15.0
2021-11-07 13:07:19 +01:00
ajs124
59b832d51a spidermonkey_91: init at 91.3.0 2021-11-07 01:16:29 +01:00
ajs124
5f12f89a6f spidermonkey_68: 68.10.0 -> 68.12.0 2021-11-07 01:16:29 +01:00
ajs124
182a36bc33 spidermonkey: drop unused patches 2021-11-07 01:16:29 +01:00
ajs124
01063a8036 spidermonkey_78: 78.11.0 -> 78.15.0 2021-11-07 01:15:51 +01:00
Ben Wolsieffer
afd86e9200 spidermonkey_78: use LLVM 12
This avoids having to build multiple LLVM versions for my systems, which is
very helpful for platforms without a binary cache (e.g. 32-bit ARM).
2021-10-08 19:55:06 -04:00
Jan Tojnar
21f3b2b50b
Merge pull request #126558 from zhaofengli/libproxy-optional-js
libproxy: Make JavaScript optional
2021-07-14 03:59:33 +02:00
Alyssa Ross
30ada3e6af spidermonkey_68: fix cross
The use of unspliced llvmPackages in configureFlags was causing an
eval failure when cross-compiling, but since later versions of
Firefox/Spidermonkey can correctly detect clang and libclang without
those arguments being specified, we can just backport that
patch (which applies cleanly), and not have to worry about it any
more.
2021-07-11 12:11:54 +00:00
Sandro
f19e197e43
Merge pull request #114942 from lopsided98/spidermonkey-arm
spidermonkey_78: fix build on armv7l
2021-06-16 18:28:22 +02:00
Zhaofeng Li
16f69cc525 spidermonkey68: Disable on RISC-V 2021-06-10 20:20:16 -07:00