GaloisInc/cryptol
1
1
Fork 0
mirror of https://github.com/GaloisInc/cryptol.git synced 2024-09-11 14:06:13 +03:00
Code Issues Projects Releases Wiki Activity

Support building with GHC 9.2

Browse Source 
This contains a variety of changes needed to make Cryptol compile with GHC 9.2:

* In GHC 9.2, enabling `UndecidableInstances` no longer implies
  enabling `FlexibleContexts` (see
  [here](https://gitlab.haskell.org/ghc/ghc/-/wikis/migration/9.2?version_id=7e2ce63ba042c1934654c4316dc02028d8d3dd31#undecidableinstances-no-longer-implies-flexiblecontexts-in-instance-declarations)).
  As a result, I had to enable `FlexibleContexts` in
  `Cryptol.ModuleSystem.Name`.
* The `argo` submodule was bumped to bring in the changes from
  GaloisInc/argo#191, which allows it to build with GHC 9.2.
* The upper version bounds on `base`, `bytestring`, `lens`, `base-compat`, and
  `sbv` were raised to allow building them with GHC 9.2.
This commit is contained in:
Ryan Scott 2022-02-09 10:34:32 -05:00
parent 63be514305
commit 980e652303
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cryptol-remote-api/cryptol-remote-api.cabal
View File

@ -40,16 +40,16 @@ common errors
common deps
build-depends:
base >=4.11.1.0 && <4.16,
base >=4.11.1.0 && <4.17,
argo,
aeson >= 1.4.2 && < 2.1,
base64-bytestring >= 1.0,
bytestring ^>= 0.10.8,
bytestring >= 0.10.8 && < 0.12,
containers >=0.6.0.1 && <0.7,
cryptol >= 2.9.0,
directory,
filepath ^>= 1.4,
lens >= 4.17 && < 5.1,
lens >= 4.17 && < 5.2,
mtl ^>= 2.2,
scientific ^>= 0.3,
text ^>= 1.2.3,

4
cryptol.cabal
View File

@ -43,7 +43,7 @@ library
Build-depends: base >= 4.8 && < 5,
arithmoi >= 0.12,
async >= 2.2 && < 2.3,
base-compat >= 0.6 && < 0.12,
base-compat >= 0.6 && < 0.13,
bv-sized >= 1.0 && < 1.1,
bytestring >= 0.10,
array >= 0.4,
@ -64,7 +64,7 @@ library
parameterized-utils >= 2.0.2,
prettyprinter >= 1.7.0,
process >= 1.2,
sbv >= 8.10 && < 8.18,
sbv >= 8.10 && < 9.1,
simple-smt >= 0.9.7,
stm >= 2.4,
strict,

2
deps/argo vendored

@ -1 +1 @@
Subproject commit afee6bb49c7831a38316221e7b9721fbc65e88d7
Subproject commit 904fb34872fcef462030fe38978842aa5a9db903

1
src/Cryptol/ModuleSystem/Name.hs
View File

@ -10,6 +10,7 @@
{-# LANGUAGE DeriveAnyClass #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE MultiParamTypeClasses #-}