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.

Sign up for GitHub

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

Jump to bottom

ocamlPackages_4_{11,12}: merlin: 3.4.2 -> 4.1; dot-merlin-reader: 3.4.2 -> 4.1 #116756

Merged
merged 2 commits into from
Mar 27, 2021
Merged

ocamlPackages_4_{11,12}: merlin: 3.4.2 -> 4.1; dot-merlin-reader: 3.4.2 -> 4.1 #116756

merged 2 commits into from
Mar 27, 2021

Commits on Mar 20, 2021

  1. dot-merlin-reader: 3.4.2 -> 4.1 

    4.1 uncoupled the versions between merlin and dot-merlin-reader which
means we can and must update them independently of each other since
merlin 4.1 is only available in specific versions for OCaml 4.11 and
4.12 respectively.

Therefore merlin now fetches its own source instead of inheriting it
from dot-merlin-reader.
    @sternenseemann
    sternenseemann committed Mar 20, 2021
    Configuration menu
    Copy the full SHA
    9f536e0 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2021

  1. ocamlPackages_4_{11,12}: merlin: 3.4.2 -> 4.1 

    Add nix expression for the OCaml-version specific versions of merlin
4.1 and conditionally call it in ocaml-packages.nix.
    @sternenseemann
    sternenseemann committed Mar 26, 2021
    Configuration menu
    Copy the full SHA
    9276e32 View commit details
    Browse the repository at this point in the history