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

Commits on May 13, 2024

  1. fix(pkg): do not prompt for passwords with git (#10498)

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
    rgrinberg authored May 13, 2024
    Configuration menu
    Copy the full SHA
    15ef9f9 View commit details
    Browse the repository at this point in the history
  2. refactor(pkg): remove some copy pasting (#10499)

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
    rgrinberg authored May 13, 2024
    Configuration menu
    Copy the full SHA
    793162a View commit details
    Browse the repository at this point in the history
  3. chore: update to what wil be melange v4 (#10517)

    * chore: update to what wil be melange v4
    
    Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
    
    * fix: broken tests
    
    Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
    
    ---------
    
    Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
    anmonteiro authored May 13, 2024
    Configuration menu
    Copy the full SHA
    20254ee View commit details
    Browse the repository at this point in the history
  4. fix(pkg): remove External_copy (#10512)

    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 <me@rgrinberg.com>
    rgrinberg authored May 13, 2024
    Configuration menu
    Copy the full SHA
    0c50085 View commit details
    Browse the repository at this point in the history
  5. test(melange): add a test showing dependent re-compilation (#10501)

    Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
    anmonteiro authored May 13, 2024
    Configuration menu
    Copy the full SHA
    f51d90b View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. test: show limitation installing multi-context libs (#10493)

    Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
    anmonteiro authored May 14, 2024
    Configuration menu
    Copy the full SHA
    77e79d8 View commit details
    Browse the repository at this point in the history
  2. test: reproduce (subdir ..) and dune-build-info bug (#10523)

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
    rgrinberg authored May 14, 2024
    Configuration menu
    Copy the full SHA
    9d92935 View commit details
    Browse the repository at this point in the history
  3. test: reproduce (subdir ..) and dune-build-info bug (#10524)

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
    rgrinberg authored May 14, 2024
    Configuration menu
    Copy the full SHA
    6984b16 View commit details
    Browse the repository at this point in the history
  4. pkg: don't use "compiler" flag to identify compiler (#10521)

    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 <stephen@sherra.tt>
    gridbugs authored May 14, 2024
    Configuration menu
    Copy the full SHA
    28de4eb View commit details
    Browse the repository at this point in the history
  5. fix(ci): typo in installable (#10526)

    Signed-off-by: Etienne Millon <me@emillon.org>
    emillon authored May 14, 2024
    Configuration menu
    Copy the full SHA
    f4939a4 View commit details
    Browse the repository at this point in the history
  6. doc: add merlin_reader to the (dialect ...) documentation (#10483)

    * doc: add `merlin_reader` to the `(dialect ...)` documentation
    
    Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
    
    * Update doc/reference/dune-project/dialect.rst
    
    Co-authored-by: Andrey Popp <8mayday@gmail.com>
    Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
    
    * fix: grammar
    
    Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
    
    * fix: use seealso and a stable tag
    
    Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
    
    ---------
    
    Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
    Co-authored-by: Andrey Popp <8mayday@gmail.com>
    Co-authored-by: Etienne Millon <me@emillon.org>
    3 people authored May 14, 2024
    Configuration menu
    Copy the full SHA
    a55af46 View commit details
    Browse the repository at this point in the history
  7. feat(melange): support lint in melange.emit (#10494)

    * test(melange): parse lint but show it not working in melange.emit
    
    Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
    
    * feat(melange): support lint in `melange.emit`
    
    Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
    
    ---------
    
    Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
    anmonteiro authored May 14, 2024
    Configuration menu
    Copy the full SHA
    e44a3d2 View commit details
    Browse the repository at this point in the history
  8. fix: remove incorrect warning when using dune-build-info and (subir .…

    ….) (#10525)
    
    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
    rgrinberg authored May 14, 2024
    Configuration menu
    Copy the full SHA
    6ca2754 View commit details
    Browse the repository at this point in the history
  9. fix(pkg): read config file on windows (#10500)

    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 <me@rgrinberg.com>
    rgrinberg authored May 14, 2024
    Configuration menu
    Copy the full SHA
    29eecf2 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. refactor(pkg): inline one off function (#10530)

    Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
    rgrinberg authored May 15, 2024
    Configuration menu
    Copy the full SHA
    f1255f0 View commit details
    Browse the repository at this point in the history
  2. refactor(boot): remove unused variables (#10527)

    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 <me@emillon.org>
    emillon authored May 15, 2024
    Configuration menu
    Copy the full SHA
    5904a00 View commit details
    Browse the repository at this point in the history
  3. boot: add a --static option to build a static dune (#10528)

    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 <me@emillon.org>
    emillon authored May 15, 2024
    Configuration menu
    Copy the full SHA
    cd9595a View commit details
    Browse the repository at this point in the history