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

Use default OCaml compiler for Coq 8.4 and change default Coq to 8.6 #23490

Merged
merged 2 commits into from Mar 5, 2017
Merged

Use default OCaml compiler for Coq 8.4 and change default Coq to 8.6 #23490

merged 2 commits into from Mar 5, 2017

Conversation

Zimmi48
Copy link
Member

@Zimmi48 Zimmi48 commented Mar 4, 2017

Motivation for this change

This PR is two-fold:

  • The first commit changes the version of OCaml used to build Coq 8.4. There is no reason to pin it to OCaml 4.01 while the default version (4.02) works fine.
  • The second commit changes the default version of Coq to the latest version (8.6). There is no reason to keep it bound to 8.4 while most important libraries and development (mathcomp / compcert ...) have been ported to 8.6.
Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of most binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@vbgl
Copy link
Contributor

vbgl commented Mar 4, 2017

For Coq 8.4, I think it is better to actually pin the OCaml version (to 4.02), as it does not work with more recent ones.

@Zimmi48 Zimmi48 force-pushed the coq_8_4_does_not_require_ocaml_4_01 branch from bcec1c7 to 83a50c2 Compare March 5, 2017 11:08
@Zimmi48
Copy link
Member Author

Zimmi48 commented Mar 5, 2017

@vbgl Good point! Done.

@vbgl vbgl merged commit 12a00b5 into NixOS:master Mar 5, 2017
@vbgl
Copy link
Contributor

vbgl commented Mar 5, 2017

Thanks. Cherry-picked to release-17.03.

@Zimmi48 Zimmi48 deleted the coq_8_4_does_not_require_ocaml_4_01 branch March 5, 2017 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Zimmi48 @vbgl