Skip to content

Commit

Permalink
Merge pull request #1499 from GaloisInc/ghc-9.4
Browse files Browse the repository at this point in the history 
Support building with GHC 9.4
  • Loading branch information
@RyanGlScott
RyanGlScott committed Feb 27, 2023
2 parents fd05e16 + cda2576 commit 4c1c5fc
Show file tree
Hide file tree
Showing 12 changed files with 168 additions and 152 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,15 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04, macos-12, windows-2019]
ghc-version: ["8.10.7", "9.0.2", "9.2.4"]
ghc-version: ["8.10.7", "9.2.4", "9.4.4"]
cabal: [ '3.8.1.0' ]
run-tests: [true]
exclude:
- os: windows-2019
ghc-version: 9.0.2
ghc-version: 9.2.4
run-tests: true
- os: windows-2019
ghc-version: 9.2.4
ghc-version: 9.4.4
run-tests: true
include:
# We include one job from an older Ubuntu LTS release to increase our
Expand Down Expand Up @@ -97,6 +98,7 @@ jobs:
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc-version }}
cabal-version: ${{ matrix.cabal }}

- name: Post-GHC installation fixups on Windows
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,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.10.7, 9.0.2, and
9.2.4. 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.2.2, and
9.4.4. 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
81 changes: 42 additions & 39 deletions cabal.GHC-8.10.7.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
active-repositories: hackage.haskell.org:merge
constraints: any.Cabal ==3.2.1.0,
constraints: any.BoundedChan ==1.0.3.0,
any.Cabal ==3.2.1.0,
any.Glob ==0.10.2,
any.GraphSCC ==1.0.4,
GraphSCC -use-maps,
Expand All @@ -12,10 +13,10 @@ constraints: any.Cabal ==3.2.1.0,
QuickCheck -old-random +templatehaskell,
any.StateVar ==1.2.2,
any.adjunctions ==4.4.2,
any.aeson ==2.0.3.0,
any.aeson ==2.1.1.0,
aeson -cffi +ordered-keymap,
any.alex ==3.2.7.1,
any.ansi-terminal ==0.11.3,
any.ansi-terminal ==0.11.4,
ansi-terminal -example,
any.ansi-wl-pprint ==0.6.9,
ansi-wl-pprint -example,
Expand All @@ -37,7 +38,7 @@ constraints: any.Cabal ==3.2.1.0,
any.base-orphans ==0.8.7,
any.base64-bytestring ==1.2.1.0,
any.basement ==0.0.15,
any.bifunctors ==5.5.13,
any.bifunctors ==5.5.14,
bifunctors +semigroups +tagged,
any.bimap ==0.5.0,
any.binary ==0.8.8.0,
Expand All @@ -49,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.4,
any.bv-sized ==1.0.5,
any.byteorder ==1.0.4,
any.bytestring ==0.10.12.0,
any.cabal-doctest ==1.0.9,
Expand All @@ -59,7 +60,7 @@ constraints: any.Cabal ==3.2.1.0,
cassava -bytestring--lt-0_10_4,
any.cereal ==0.5.8.3,
cereal -bytestring-builder,
any.chimera ==0.3.2.0,
any.chimera ==0.3.3.0,
chimera +representable,
any.clock ==0.8.3,
clock -llvm,
Expand All @@ -73,7 +74,7 @@ constraints: any.Cabal ==3.2.1.0,
any.containers ==0.6.5.1,
any.contravariant ==1.5.5,
contravariant +semigroups +statevar +tagged,
any.cookie ==0.4.5,
any.cookie ==0.4.6,
any.criterion ==1.6.0.0,
criterion -embed-data-files -fast,
any.criterion-measurement ==0.2.0.0,
Expand All @@ -85,12 +86,12 @@ constraints: any.Cabal ==3.2.1.0,
cryptol-test-runner -static,
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-array-byte ==0.1.0.1,
any.data-default-class ==0.1.2.0,
any.data-fix ==0.3.2,
any.deepseq ==1.4.4.0,
any.dense-linear-algebra ==0.1.0.0,
any.deriving-compat ==0.6.1,
any.deriving-compat ==0.6.2,
deriving-compat +base-4-9 +new-functor-classes +template-haskell-2-11,
any.directory ==1.3.6.0,
any.distributive ==0.6.2.1,
Expand All @@ -104,19 +105,19 @@ constraints: any.Cabal ==3.2.1.0,
any.exceptions ==0.10.4,
any.extensible-exceptions ==0.1.1.4,
any.extra ==1.7.12,
any.fail ==4.9.0.0,
any.fast-logger ==3.1.1,
any.fast-logger ==3.2.0,
any.filelock ==0.1.1.5,
any.filepath ==1.4.2.1,
any.fingertree ==0.1.5.0,
any.free ==5.1.9,
any.free ==5.1.10,
any.generically ==0.1,
any.ghc-boot-th ==8.10.7,
any.ghc-prim ==0.6.1,
any.gitrev ==1.3.1,
any.happy ==1.20.0,
any.hashable ==1.3.5.0,
any.happy ==1.20.1.1,
any.hashable ==1.4.2.0,
hashable +integer-gmp -random-initial-seed,
any.hashtables ==1.2.4.2,
any.hashtables ==1.3.1,
hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks,
any.haskeline ==0.8.2,
any.heredoc ==0.2.0.0,
Expand All @@ -127,7 +128,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.3,
any.http2 ==4.0.0,
http2 -devel -doc -h2spec,
any.ieee754 ==0.8.0,
any.indexed-traversable ==0.1.2,
Expand All @@ -145,27 +146,25 @@ constraints: any.Cabal ==3.2.1.0,
any.language-c99 ==0.2.0,
any.language-c99-simple ==0.2.2,
any.language-c99-util ==0.2.0,
any.lens ==5.1.1,
any.lens ==5.2,
lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy,
any.libBF ==0.6.5.1,
libBF -system-libbf,
any.libffi ==0.2,
any.libffi ==0.2.1,
libffi +ghc-bundled-libffi,
any.math-functions ==0.3.4.2,
math-functions +system-erf +system-expm1,
any.megaparsec ==9.2.1,
megaparsec -dev,
any.memory ==0.18.0,
memory +support_bytestring +support_deepseq,
any.microstache ==1.0.2.2,
any.microstache ==1.0.2.3,
any.mod ==0.1.2.2,
mod +semirings +vector,
any.monad-control ==1.0.3.1,
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.7,
network -devel,
any.network-byte-order ==0.1.6,
Expand All @@ -176,9 +175,10 @@ constraints: any.Cabal ==3.2.1.0,
any.old-time ==1.1.0.3,
any.optparse-applicative ==0.16.1.0,
optparse-applicative +process,
any.ordered-containers ==0.2.3,
any.panic ==0.4.0.1,
any.parallel ==3.2.2.0,
any.parameterized-utils ==2.1.5.0,
any.parameterized-utils ==2.1.6.0,
parameterized-utils +unsafe-operations,
any.parsec ==3.1.14.0,
any.parser-combinators ==1.3.0,
Expand All @@ -194,19 +194,23 @@ constraints: any.Cabal ==3.2.1.0,
any.quickcheck-instances ==0.3.28,
quickcheck-instances -bytestring-builder,
any.random ==1.2.1.1,
any.recv ==0.1.0,
any.reflection ==2.1.6,
reflection -slow +template-haskell,
any.regex-base ==0.94.0.2,
any.regex-compat ==0.95.2.1,
any.regex-posix ==0.96.0.1,
regex-posix -_regex-posix-clib,
any.resourcet ==1.2.6,
any.resourcet ==1.3.0,
any.rts ==1.0.1,
any.s-cargot ==0.1.5.0,
s-cargot -build-example,
any.safe ==0.3.19,
any.safe-exceptions ==0.1.7.3,
any.sbv ==9.0,
any.scientific ==0.3.7.0,
scientific -bytestring-builder -integer-simple,
any.scotty ==0.12,
any.scotty ==0.12.1,
any.semialign ==1.2.0.1,
semialign +semigroupoids,
any.semigroupoids ==5.3.7,
Expand All @@ -222,17 +226,17 @@ 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.1.0,
any.statistics ==0.16.1.2,
any.stm ==2.5.0.1,
any.streaming-commons ==0.2.2.4,
any.streaming-commons ==0.2.2.5,
streaming-commons -use-bytestring-builder,
any.strict ==0.4.0.1,
strict +assoc,
any.syb ==0.7.2.2,
any.tagged ==0.8.6.1,
tagged +deepseq +transformers,
any.tasty ==1.4.2.3,
tasty +clock +unix,
any.tasty ==1.4.3,
tasty +unix,
any.tasty-hunit ==0.10.0.3,
any.tasty-quickcheck ==0.10.2,
any.template-haskell ==2.16.0.0,
Expand Down Expand Up @@ -270,34 +274,33 @@ constraints: any.Cabal ==3.2.1.0,
any.unix-compat ==0.6,
unix-compat -old-time,
any.unix-time ==0.4.8,
any.unliftio ==0.2.22.0,
any.unliftio-core ==0.2.0.1,
any.unliftio ==0.2.23.0,
any.unliftio-core ==0.2.1.0,
any.unordered-containers ==0.2.19.1,
unordered-containers -debug,
any.utf8-string ==1.0.2,
any.uuid ==1.3.15,
any.uuid-types ==1.0.5,
any.vault ==0.3.1.5,
vault +useghc,
any.vector ==0.12.3.1,
any.vector ==0.13.0.0,
vector +boundschecks -internalchecks -unsafechecks -wall,
any.vector-algorithms ==0.9.0.1,
vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
any.vector-binary-instances ==0.2.5.2,
any.vector-stream ==0.1.0.0,
any.vector-th-unbox ==0.2.2,
any.versions ==5.0.3,
any.versions ==5.0.4,
any.void ==0.7.3,
void -safe,
any.wai ==3.2.3,
any.wai-extra ==3.1.12.1,
any.wai-extra ==3.1.13.0,
wai-extra -build-example,
any.wai-logger ==2.4.0,
any.warp ==3.3.22,
any.warp ==3.3.24,
warp +allow-sendfilefd -network-bytestring -warp-debug +x509,
any.warp-tls ==3.3.3,
any.wcwidth ==0.0.2,
wcwidth -cli +split-base,
any.what4 ==1.3,
any.warp-tls ==3.3.5,
any.what4 ==1.4,
what4 -drealtestdisable -solvertests -stptestdisable,
any.witherable ==0.4.2,
any.word8 ==0.1.3,
Expand All @@ -309,4 +312,4 @@ constraints: any.Cabal ==3.2.1.0,
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-09-24T14:14:21Z
index-state: hackage.haskell.org 2023-02-13T12:20:33Z

0 comments on commit 4c1c5fc

Please sign in to comment.