Skip to content

Commit

Permalink
Support building with GHC 9.4
Browse files Browse the repository at this point in the history
This contains a varity of changes needed to make the libraries in the `cryptol`
repo compile with GHC 9.4:

* GHC 9.4 is pickier about requiring the use of the `FlexibleContexts`
  extension, that is now enabled in more places.
* I bumped the upper version bounds of various dependencies to allow them to
  build with GHC 9.4.

Fixes #1487.
  • Loading branch information
RyanGlScott committed Feb 13, 2023
1 parent 4b89554 commit 5f36807
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
10 changes: 5 additions & 5 deletions cryptol-remote-api/cryptol-remote-api.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,22 @@ common errors

common deps
build-depends:
base >=4.11.1.0 && <4.17,
base >=4.11.1.0 && <4.18,
argo,
aeson >= 1.4.2 && < 2.1,
aeson >= 1.4.2 && < 2.2,
base64-bytestring >= 1.0,
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.2,
lens >= 4.17 && < 5.3,
mtl ^>= 2.2,
scientific ^>= 0.3,
text ^>= 1.2.3,
text >= 1.2.3 && < 2.1,
tf-random,
unordered-containers ^>= 0.2,
vector ^>= 0.12,
vector ^>= 0.13,

default-language: Haskell2010

Expand Down
4 changes: 2 additions & 2 deletions cryptol.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@ library
mtl >= 2.2.1,
time >= 1.6.0.1,
panic >= 0.3,
what4 >= 1.3 && < 1.4
what4 >= 1.4 && < 1.5

if impl(ghc >= 9.0)
build-depends: ghc-bignum >= 1.0 && < 1.3
build-depends: ghc-bignum >= 1.0 && < 1.4
else
build-depends: integer-gmp >= 1.0 && < 1.1

Expand Down
1 change: 1 addition & 0 deletions src/Cryptol/Eval/SBV.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

{-# LANGUAGE BlockArguments #-}
{-# LANGUAGE DeriveFunctor #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE LambdaCase #-}
Expand Down
1 change: 1 addition & 0 deletions src/Cryptol/Eval/What4.hs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

{-# LANGUAGE BlockArguments #-}
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE MultiWayIf #-}
Expand Down

0 comments on commit 5f36807

Please sign in to comment.