Skip to content

Commit

Permalink
Merge pull request #1349 from GaloisInc/ghc-9.2
Browse files Browse the repository at this point in the history 
Support building with GHC 9.2
  • Loading branch information
@RyanGlScott
RyanGlScott authored May 5, 2022
2 parents 63be514 + 22c61d6 commit 5a2beda
Show file tree
Hide file tree
Showing 39 changed files with 549 additions and 177 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
ghc-version: ["8.8.4", "8.10.7", "9.0.2"]
ghc-version: ["8.8.4", "8.10.7", "9.0.2", "9.2.2"]
exclude:
# https://gitlab.haskell.org/ghc/ghc/-/issues/18550
- os: windows-latest
ghc-version: 8.10.7
- os: windows-latest
ghc-version: 9.0.2
- os: windows-latest
ghc-version: 9.2.2
outputs:
test-lib-json: ${{ steps.test-lib.outputs.targets-json }}
env:
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ Windows. We regularly build and test it in the following environments:
## Prerequisites

Cryptol is regularly built and tested with the three most recent
versions of GHC, which at the time of this writing are 8.8.4, 8.10.7, and
9.0.2. The easiest way to install an approporiate version of GHC is
versions of GHC, which at the time of this writing are 8.10.7, 9.0.2, and
9.2.2. The easiest way to install an approporiate version of GHC is
with [ghcup](https://www.haskell.org/ghcup/).

Some supporting non-Haskell libraries are required to build
Expand Down
78 changes: 39 additions & 39 deletions cabal.GHC-8.10.7.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ constraints: any.Cabal ==3.2.1.0,
any.adjunctions ==4.4,
any.aeson ==2.0.3.0,
aeson -cffi +ordered-keymap,
any.alex ==3.2.6,
alex +small_base,
any.ansi-terminal ==0.11.1,
any.alex ==3.2.7.1,
any.ansi-terminal ==0.11.3,
ansi-terminal -example,
any.ansi-wl-pprint ==0.6.9,
ansi-wl-pprint -example,
Expand All @@ -36,11 +35,11 @@ constraints: any.Cabal ==3.2.1.0,
attoparsec -developer,
any.auto-update ==0.1.6,
any.base ==4.14.3.0,
any.base-compat ==0.11.2,
any.base-compat-batteries ==0.11.2,
any.base-compat ==0.12.1,
any.base-compat-batteries ==0.12.1,
any.base-orphans ==0.8.6,
any.base64-bytestring ==1.2.1.0,
any.basement ==0.0.12,
any.basement ==0.0.14,
any.bifunctors ==5.5.11,
bifunctors +semigroups +tagged,
any.bimap ==0.4.0,
Expand All @@ -51,7 +50,7 @@ constraints: any.Cabal ==3.2.1.0,
any.blaze-html ==0.9.1.2,
any.blaze-markup ==0.8.2.8,
any.bsb-http-chunked ==0.0.0.4,
any.bv-sized ==1.0.3,
any.bv-sized ==1.0.4,
any.byteorder ==1.0.4,
any.bytestring ==0.10.12.0,
any.cabal-doctest ==1.0.9,
Expand All @@ -63,19 +62,20 @@ constraints: any.Cabal ==3.2.1.0,
cereal -bytestring-builder,
any.chimera ==0.3.2.0,
chimera +representable,
any.clock ==0.8.2,
any.clock ==0.8.3,
clock -llvm,
any.code-page ==0.2.1,
any.colour ==2.3.6,
any.comonad ==5.0.8,
comonad +containers +distributive +indexed-traversable,
any.config-value ==0.8.2,
any.constraints ==0.13.2,
any.concurrent-extra ==0.7.0.12,
any.config-value ==0.8.2.1,
any.constraints ==0.13.3,
any.containers ==0.6.5.1,
any.contravariant ==1.5.5,
contravariant +semigroups +statevar +tagged,
any.cookie ==0.4.5,
any.criterion ==1.5.12.0,
any.criterion ==1.5.13.0,
criterion -embed-data-files -fast,
any.criterion-measurement ==0.1.3.0,
criterion-measurement -fast,
Expand All @@ -84,7 +84,7 @@ constraints: any.Cabal ==3.2.1.0,
cryptol +relocatable -static,
cryptol-remote-api -notthreaded -static,
cryptol-test-runner -static,
any.cryptonite ==0.29,
any.cryptonite ==0.30,
cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes,
any.data-binary-ieee754 ==0.4.4,
any.data-default-class ==0.1.2.0,
Expand All @@ -101,15 +101,15 @@ constraints: any.Cabal ==3.2.1.0,
any.easy-file ==0.2.2,
any.entropy ==0.4.1.7,
entropy -halvm,
any.exact-pi ==0.5.0.1,
any.exact-pi ==0.5.0.2,
any.exceptions ==0.10.4,
any.extensible-exceptions ==0.1.1.4,
any.extra ==1.7.10,
any.fail ==4.9.0.0,
any.fast-logger ==3.1.0,
any.fast-logger ==3.1.1,
any.filelock ==0.1.1.5,
any.filepath ==1.4.2.1,
any.fingertree ==0.1.4.2,
any.fingertree ==0.1.5.0,
any.free ==5.1.7,
any.ghc-boot-th ==8.10.7,
any.ghc-prim ==0.6.1,
Expand All @@ -127,7 +127,7 @@ constraints: any.Cabal ==3.2.1.0,
hsc2hs -in-ghc-tree,
any.http-date ==0.0.11,
any.http-types ==0.12.3,
any.http2 ==3.0.2,
any.http2 ==3.0.3,
http2 -devel -doc -h2spec,
any.indexed-traversable ==0.1.2,
any.indexed-traversable-instances ==0.1.1,
Expand All @@ -141,32 +141,32 @@ constraints: any.Cabal ==3.2.1.0,
any.iproute ==1.7.12,
any.js-chart ==2.9.4.1,
any.kan-extensions ==5.2.3,
any.lens ==5.0.1,
any.lens ==5.1,
lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy,
any.libBF ==0.6.3,
libBF -system-libbf,
any.math-functions ==0.3.4.2,
math-functions +system-erf +system-expm1,
any.megaparsec ==9.2.0,
megaparsec -dev,
any.memory ==0.16.0,
memory +support_basement +support_bytestring +support_deepseq +support_foundation,
any.memory ==0.17.0,
memory +support_bytestring +support_deepseq,
any.microstache ==1.0.2,
any.mod ==0.1.2.2,
mod +semirings +vector,
any.monad-control ==1.0.3.1,
any.monad-par ==0.3.5,
monad-par -chaselev -newgeneric,
any.monad-par-extras ==0.3.3,
any.monadLib ==3.10,
any.monadLib ==3.10.1,
any.mtl ==2.2.2,
any.mwc-random ==0.15.0.2,
any.nats ==1.1.2,
nats +binary +hashable +template-haskell,
any.network ==3.1.2.5,
any.network ==3.1.2.7,
network -devel,
any.network-byte-order ==0.1.6,
any.network-info ==0.2.0.10,
any.network-info ==0.2.1,
any.newtype-generics ==0.6.1,
any.numtype-dk ==0.5.0.3,
any.old-locale ==1.0.0.7,
Expand All @@ -175,7 +175,7 @@ constraints: any.Cabal ==3.2.1.0,
optparse-applicative +process,
any.panic ==0.4.0.1,
any.parallel ==3.2.2.0,
any.parameterized-utils ==2.1.4.0,
any.parameterized-utils ==2.1.5.0,
parameterized-utils +unsafe-operations,
any.parsec ==3.1.14.0,
any.parser-combinators ==1.3.0,
Expand All @@ -200,7 +200,7 @@ constraints: any.Cabal ==3.2.1.0,
any.resourcet ==1.2.4.3,
any.rts ==1.0.1,
any.safe ==0.3.19,
any.sbv ==8.16,
any.sbv ==9.0,
any.scientific ==0.3.7.0,
scientific -bytestring-builder -integer-simple,
any.scotty ==0.12,
Expand All @@ -219,9 +219,9 @@ constraints: any.Cabal ==3.2.1.0,
any.simple-smt ==0.9.7,
any.splitmix ==0.1.0.4,
splitmix -optimised-mixer,
any.statistics ==0.16.0.1,
any.statistics ==0.16.0.2,
any.stm ==2.5.0.1,
any.streaming-commons ==0.2.2.3,
any.streaming-commons ==0.2.2.4,
streaming-commons -use-bytestring-builder,
any.strict ==0.4.0.1,
strict +assoc,
Expand Down Expand Up @@ -252,7 +252,7 @@ constraints: any.Cabal ==3.2.1.0,
any.time-compat ==1.9.6.1,
time-compat -old-locale,
any.time-manager ==0.0.0,
any.tls ==1.5.6,
any.tls ==1.5.7,
tls +compat -hans +network,
any.tls-session-manager ==0.0.4,
any.transformers ==0.5.6.2,
Expand All @@ -267,9 +267,9 @@ constraints: any.Cabal ==3.2.1.0,
any.unix-compat ==0.5.4,
unix-compat -old-time,
any.unix-time ==0.4.7,
any.unliftio ==0.2.20,
any.unliftio ==0.2.22.0,
any.unliftio-core ==0.2.0.1,
any.unordered-containers ==0.2.16.0,
any.unordered-containers ==0.2.19.1,
unordered-containers -debug,
any.utf8-string ==1.0.2,
any.uuid ==1.3.15,
Expand All @@ -282,28 +282,28 @@ constraints: any.Cabal ==3.2.1.0,
vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
any.vector-binary-instances ==0.2.5.2,
any.vector-th-unbox ==0.2.2,
any.versions ==5.0.1,
any.versions ==5.0.3,
any.void ==0.7.3,
void -safe,
any.wai ==3.2.3,
any.wai-extra ==3.1.8,
any.wai-extra ==3.1.10,
wai-extra -build-example,
any.wai-logger ==2.3.7,
any.warp ==3.3.18,
warp +allow-sendfilefd -network-bytestring -warp-debug,
any.wai-logger ==2.4.0,
any.warp ==3.3.20,
warp +allow-sendfilefd -network-bytestring -warp-debug +x509,
any.warp-tls ==3.3.2,
any.wcwidth ==0.0.2,
wcwidth -cli +split-base,
any.what4 ==1.3,
what4 -drealtestdisable -solvertests -stptestdisable,
any.witherable ==0.4.2,
any.word8 ==0.1.3,
any.x509 ==1.7.5,
any.x509-store ==1.6.7,
any.x509-validation ==1.6.11,
any.x509 ==1.7.6,
any.x509-store ==1.6.9,
any.x509-validation ==1.6.12,
any.xml ==1.3.14,
any.zenc ==0.1.2,
any.zlib ==0.6.2.3,
any.zlib ==0.6.3.0,
zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
any.zlib-bindings ==0.1.1.5
index-state: hackage.haskell.org 2022-04-21T14:15:08Z
index-state: hackage.haskell.org 2022-05-04T18:13:54Z
Loading

0 comments on commit 5a2beda

Please sign in to comment.