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.

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

Support building with GHC 9.6 #1572

Merged
merged 4 commits into from
Sep 2, 2023
Merged

Support building with GHC 9.6 #1572

merged 4 commits into from
Sep 2, 2023

Conversation

RyanGlScott
Copy link
Contributor

This contains a varity of changes needed to make cryptol compile with GHC
9.6:

  • mtl-2.3.1 (bundled with GHC 9.6) no longer re-exports Control.Monad or related modules from the various mtl modules. I now use explicit imports from mtl modules to ensure that the necessary identifiers are always in scope, regardless of whether we are using mtl-2.3.* or an older mtl version.
  • directory-1.3.8.0 (bundled with GHC 9.6) no longer marks its modules as Safe, so Cryptol.TypeCheck.Solver.SMT (a module explicitly marked as Safe) no longer compiles due to its System.Directory import. I have changed Cryptol.TypeCheck.Solver.SMT to be Trustworthy instead to avoid this.
  • I have raised the upper version bounds on libraries such as base and aeson to allow a GHC 9.6–compatible build plan.
  • I have bumped the argo submodule to bring in the changes from Allow building with GHC 9.6 argo#200, which allows argo to build with GHC 9.6.

RyanGlScott and others added 4 commits August 31, 2023 05:52
This contains a varity of changes needed to make `cryptol` compile with GHC
9.6:

* `mtl-2.3.1` (bundled with GHC 9.6) no longer re-exports `Control.Monad` or
  related modules from the various `mtl` modules. I now use explicit imports
  from `mtl` modules to ensure that the necessary identifiers are always in
  scope, regardless of whether we are using `mtl-2.3.*` or an older `mtl`
  version.
* `directory-1.3.8.0` (bundled with GHC 9.6) no longer marks its modules as
  `Safe`, so `Cryptol.TypeCheck.Solver.SMT` (a module explicitly marked as
  `Safe`) no longer compiles due to its `System.Directory` import. I have
  changed `Cryptol.TypeCheck.Solver.SMT` to be `Trustworthy` instead to avoid
  this.
* I have raised the upper version bounds on libraries such as `base` and `aeson`
  to allow a GHC 9.6–compatible build plan.
* I have bumped the `argo` submodule to bring in the changes from
  GaloisInc/argo#200, which allows `argo` to build with GHC 9.6.
@RyanGlScott RyanGlScott requested review from yav and kquick August 31, 2023 10:30
@RyanGlScott RyanGlScott temporarily deployed to github-pages August 31, 2023 10:30 — with GitHub Actions Inactive
@RyanGlScott RyanGlScott merged commit bd35c9b into master Sep 2, 2023
43 checks passed
@RyanGlScott RyanGlScott deleted the ghc-9.6 branch September 2, 2023 00:36
RyanGlScott added a commit to GaloisInc/saw-script that referenced this pull request Nov 20, 2023
Making SAW build with GHC 9.6 is almost entirely a matter of being more precise
with `mtl`-related imports to account for `mtl-2.3.1` not re-exporting as many
identifiers from `Control.Monad`, `Control.Monad.IO.Class`, etc.

I have also bumped the following submodules and `source-repository-package`s to
allow them to build with GHC 9.6:

* `cryptol`: GaloisInc/cryptol#1572
* `hobbits`: eddywestbrook/hobbits#9
RyanGlScott added a commit to GaloisInc/saw-script that referenced this pull request Nov 20, 2023
Making SAW build with GHC 9.6 is almost entirely a matter of being more precise
with `mtl`-related imports to account for `mtl-2.3.1` not re-exporting as many
identifiers from `Control.Monad`, `Control.Monad.IO.Class`, etc.

I have also bumped the following submodules and `source-repository-package`s to
allow them to build with GHC 9.6:

* `cryptol`: GaloisInc/cryptol#1572
* `hobbits`: eddywestbrook/hobbits#9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants