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

Keep older versions of cmdliner and ocp-indent #26286

Merged
merged 5 commits into from
Jun 2, 2017
Merged

Keep older versions of cmdliner and ocp-indent #26286

merged 5 commits into from
Jun 2, 2017
+93 −14

Conversation

romildo
Copy link
Contributor

@romildo romildo commented May 31, 2017

Motivation for this change

PR #26195 (which upgraded cmdliner to version 1.0.0) introduced an issue because some ocaml packages are not yet compatible with it.

This PR keeps both versions of cmdliner (the old 0.9.8 and the new 1.0.0) and makes the old one the default.

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 all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

cc @vbgl

Sorry, something went wrong.

romildo added 3 commits May 31, 2017 17:01
@romildo
cmdliner_1_0: init at 1.0.0
32e12ff 
Version 1.0 breaks API and some packages does currently not compile
with it. So it is added as a new package.
@romildo
cmdliner: 1.0.0 -> 0.9.8

Verified

This commit was signed with the committer’s verified signature.
fpletz Franz Pletz
GPG key ID: 846FDED7792617B4
Verified
Learn about vigilant mode
61b8fdd 
Downgrade to version 0.9.8 because the new version 1.0.0 breaks API and
some pacakges do not yet compile with it.
@romildo
ocp-indent: depends on cmdliner minimum version 1.0.0

Verified

This commit was signed with the committer’s verified signature.
fpletz Franz Pletz
GPG key ID: 846FDED7792617B4
Verified
Learn about vigilant mode
98058ef
@romildo romildo mentioned this pull request May 31, 2017
Merged
7 tasks
@vbgl
Copy link
Contributor

vbgl commented Jun 1, 2017

Thanks for this prompt fix.

ocp-index seems to be broken as well; I think it’s also related to the ocp-indent update.

@romildo
Copy link
Contributor Author

romildo commented Jun 1, 2017

ocp-index seems to be broken as well; I think it’s also related to the ocp-indent update.

There is a related issue on upstream: OCamlPro/ocp-index#102

@romildo
Copy link
Contributor Author

romildo commented Jun 1, 2017

Should the old version of ocp-indent be kept too?

romildo added 2 commits June 1, 2017 18:43
@romildo
ocp-indent: readd old version 1.5.2
7ba979c 
Some packages (ocp-index, for instance) are not yet compatible with
newer versions of ocp-indent. So version 1.5.2 is still needed.
@romildo
ocp-index: add explicitly dependency on ocpIndent_1_5_2
4103994 
ocp-index does not yet compile with newer versions of ocp-indent.
@romildo
Copy link
Contributor Author

romildo commented Jun 1, 2017

I have added ocp-indent-1.5.2 (attribute ocpIndent_1_5_2) so that ocp-index can be built successfully. Currently ocp-index does not compile with newer versions of ocp-indent.

@romildo romildo changed the title cmdliner: add version 0.9.8 back while keepking version 1.0.0 Keep older versions of cmdliner and ocp-indent Jun 1, 2017
@vbgl vbgl merged commit c733555 into NixOS:master Jun 2, 2017
@romildo romildo deleted the fix.cmdliner branch June 2, 2017 17:28
@vbgl vbgl mentioned this pull request Jun 26, 2018
Merged
9 tasks
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
@romildo @vbgl