Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync toolchains with main #10532

Closed
wants to merge 17 commits into from
Closed

sync toolchains with main #10532

wants to merge 17 commits into from

Conversation

emillon
Copy link
Collaborator

@emillon emillon commented May 15, 2024

rgrinberg and others added 17 commits May 13, 2024 16:14
* chore: update to what wil be melange v4

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

* fix: broken tests

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

---------

Signed-off-by: Antonio Nuno Monteiro <[email protected]>
Make it the same as file://. Both of these constructors mean the same
thing, so let's keep one of them.

Signed-off-by: Rudi Grinberg <[email protected]>
Opam's "compiler" flag is used too broadly to accurately identify
packages containing ocaml compilers. For example this flag is set for
compiler options packages such as ocaml-option-flambda which configure
the ocaml-variants package, effectively preventing the use of compiler
options packages, as ocaml-variants also has the "compiler" flag set,
and dune only permits a single compiler package in a solution.

This change fixes this problem by using the presence of the
"ocaml-core-compiler" conflict class to identify compiler
packages.

Signed-off-by: Stephen Sherratt <[email protected]>
* doc: add `merlin_reader` to the `(dialect ...)` documentation

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

* Update doc/reference/dune-project/dialect.rst

Co-authored-by: Andrey Popp <[email protected]>
Signed-off-by: Antonio Nuno Monteiro <[email protected]>

* fix: grammar

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

* fix: use seealso and a stable tag

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

---------

Signed-off-by: Antonio Nuno Monteiro <[email protected]>
Co-authored-by: Andrey Popp <[email protected]>
Co-authored-by: Etienne Millon <[email protected]>
* test(melange): parse lint but show it not working in melange.emit

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

* feat(melange): support lint in `melange.emit`

Signed-off-by: Antonio Nuno Monteiro <[email protected]>

---------

Signed-off-by: Antonio Nuno Monteiro <[email protected]>
Do not use OpamFile.Dot_config.read as it relies on some stubs to
resolve paths in a special way we don't need.

Signed-off-by: Rudi Grinberg <[email protected]>
Some options are interpreted by `bootstrap.ml`, other ones by
`duneboot.ml`. They need to be parsed, but can be ignored instead of
setting a dummy reference.

Signed-off-by: Etienne Millon <[email protected]>
This options adds `-ccopt -static` to the link flags (this requires a
libc that supports static linking).

The motivation is `nix build .#dune-static`, which otherwise requires
patching sources.

Signed-off-by: Etienne Millon <[email protected]>
@emillon emillon closed this May 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants