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

nix: Build with OCaml 5.2 #1769

Merged
merged 3 commits into from
May 17, 2024
Merged

nix: Build with OCaml 5.2 #1769

merged 3 commits into from
May 17, 2024

Conversation

Julow
Copy link
Contributor

@Julow Julow commented May 16, 2024

This changes flake.nix to build Merlin with OCaml 5.2 in order to support 5.2-only features.

Nixpkgs needed to be updated too.

@voodoos voodoos added the no changelog Turn off CI changelog-check label May 16, 2024
@Julow
Copy link
Contributor Author

Julow commented May 16, 2024 •
edited
Loading

I changed nix develop to install the current merlin instead of ocaml-lsp (which pulled nixpkgs' version of merlin). I changed the definition so that adding ocaml-lsp back to the devShells would use the current merlin but the last release is not co-installable.
It's possible to pin a branch of ocaml-lsp but I think this would add too much maintenance.
Are there any users of nix develop ? (other than the CI, which doesn't need ocaml-lsp)

@voodoos voodoos force-pushed the nix-ocaml-52 branch 2 times, most recently from 5710035 to 5ec28f0 Compare May 17, 2024 07:52
Julow and others added 3 commits May 17, 2024 10:03
@Julow @voodoos
nix: Build with OCaml 5.2
abe7d40 
This changes flake.nix to build Merlin with OCaml 5.2 in order to
support 5.2-only features.

Nixpkgs needed to be updated too.
@Julow @voodoos
nix: Use the current merlin in 'nix develop'
4c2412d 
The previous devShells installed 'ocaml-lsp', which depended on nixpkgs'
merlin. Since switching to OCaml 5.2 this no longer works but also makes
little sense.

This uses the overrideScope mechanism to make sure that anything added
to the devShells use the current merlin.

Unfortunately, 'ocaml-lsp' is not compatible with the current Merlin and
is dropped from the devShells.
@voodoos
test: make test reproducible
2ac4c23
voodoos
voodoos approved these changes May 17, 2024
View reviewed changes
Copy link
Collaborator

@voodoos voodoos left a comment

Choose a reason for hiding this comment

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

Thanks a lot @Julow !

@voodoos voodoos merged commit 4fccc83 into ocaml:master May 17, 2024
8 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@voodoos voodoos voodoos approved these changes

Assignees
No one assigned
Labels
no changelog Turn off CI changelog-check
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Julow @voodoos