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

Remove dependency on state value for opam2nix use cases #4147

Merged
merged 6 commits into from
Jul 3, 2020
Merged

Remove dependency on state value for opam2nix use cases #4147

merged 6 commits into from
Jul 3, 2020

Conversation

timbertson
Copy link
Contributor

@timbertson timbertson commented Apr 20, 2020 •
edited
Loading

Fixes #4030

@timbertson timbertson mentioned this pull request Apr 20, 2020
Closed
@rjbou rjbou added this to the Next milestone Apr 22, 2020
@rjbou rjbou added the PR: WIP Not for merge at this stage label Apr 22, 2020
@rjbou rjbou removed this from the Next milestone May 20, 2020
@rjbou rjbou requested review from rjbou and AltGr May 28, 2020 18:57
rjbou
rjbou approved these changes Jun 24, 2020
View reviewed changes
Copy link
Collaborator

@rjbou rjbou left a comment

Choose a reason for hiding this comment

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

A little refactor that is completely reasonable to integrate in opam. Just minor/nitpicking comments (naming).

Thanks for the pr!

@rjbou rjbou removed the request for review from AltGr June 24, 2020 13:04
avsm
avsm reviewed Jun 24, 2020
View reviewed changes
src/state/opamSwitchState.mli Outdated
@@ -54,6 +54,13 @@ val compute_available_packages:
pinned:package_set -> opams:OpamFile.OPAM.t package_map ->
package_set

(** Raw function to compute the conflicts for all packages, given
the set of available packages and the corresponding opam files.
the `u_conflicts` field when building a universe manually. *)
Copy link
Member

Choose a reason for hiding this comment

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

Is there a missing line in this ocamldoc comment? the u_conflicts field <...> seems to be incomplete.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure where that went, fixed thanks.

rjbou
rjbou reviewed Jun 24, 2020
View reviewed changes
Copy link
Collaborator

@rjbou rjbou left a comment

Choose a reason for hiding this comment

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

Oups, part of my review was missing.

@rjbou
Copy link
Collaborator

rjbou commented Jun 25, 2020

The context free switch paths is not only advantageous for opam2nix, but also for opam-installer:) cf. #4237

@rjbou rjbou mentioned this pull request Jun 25, 2020
Merged
@timbertson
Copy link
Contributor Author

Thanks for the feedback, I've pushed updates to address them (as well as merge with master). The CI failures don't look related to my changes.

@rjbou rjbou removed PR: NEEDS UPDATE PR: WIP Not for merge at this stage labels Jun 30, 2020
@rjbou rjbou added this to the 2.1.0~alpha2 milestone Jun 30, 2020
@rjbou rjbou marked this pull request as ready for review June 30, 2020 13:11
@rjbou
Copy link
Collaborator

rjbou commented Jul 3, 2020

Yes, CI was broken on master, but it's ok (all green on my launches). Thanks!

@rjbou rjbou merged commit 160e8b0 into ocaml:master Jul 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@avsm avsm avsm left review comments

@rjbou rjbou rjbou approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.1.0~alpha2
Development

Successfully merging this pull request may close these issues.

Feedback: places where opam2nix implementation required reimplementing parts of opam
3 participants
@timbertson @rjbou @avsm