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

Conversation

sternenseemann
Copy link
Member

Motivation for this change

OCaml 4.12 support. Testing from actual merlin users would be appreciated!

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@sternenseemann sternenseemann force-pushed the merlin-4.1 branch 2 times, most recently from 9d66513 to 5c32f74 Compare March 20, 2021 00:03
@sternenseemann
dot-merlin-reader: 3.4.2 -> 4.1
9f536e0 
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
Copy link
Member Author

@ofborg build ocaml-ng.ocamlPackages_4_11.merlin ocaml-ng.ocamlPackages_4_12.merlin ocamlPackages.merlin

@sternenseemann
ocamlPackages_4_{11,12}: merlin: 3.4.2 -> 4.1
9276e32 
Add nix expression for the OCaml-version specific versions of merlin
4.1 and conditionally call it in ocaml-packages.nix.
anmonteiro
anmonteiro approved these changes Mar 27, 2021
View reviewed changes
Copy link
Member

@anmonteiro anmonteiro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is what I've been using in my overlays, so I'm all for it.

@sternenseemann sternenseemann merged commit ef64504 into NixOS:master Mar 27, 2021
@sternenseemann sternenseemann deleted the merlin-4.1 branch March 27, 2021 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@anmonteiro anmonteiro anmonteiro approved these changes

@symphorien symphorien symphorien approved these changes

@vbgl vbgl Awaiting requested review from vbgl

Assignees
No one assigned
Labels
6.topic: ocaml 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@sternenseemann @anmonteiro @SuperSandro2000 @symphorien