Skip to content

Commit

Permalink
Merge pull request #1860 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 authored May 26, 2023
2 parents b89b8df + e19c9cb commit 48731f1
Show file tree
Hide file tree
Showing 28 changed files with 244 additions and 238 deletions.
13 changes: 1 addition & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
matrix:
os: [ubuntu-22.04, macos-12, windows-latest]
cabal: ["3.10.1.0"]
ghc: ["8.8.4", "8.10.7", "9.2.7"]
ghc: ["8.10.7", "9.2.7", "9.4.4"]
run-tests: [true]
include:
# We include one job from an older Ubuntu LTS release to increase our
Expand All @@ -79,17 +79,6 @@ jobs:
ghc: "8.10.7"
cabal: "3.10.1.0"
run-tests: false
exclude:
# Exclude 8.8 on macOS 12 due to
# https://gitlab.haskell.org/ghc/ghc/-/issues/18446
- os: macos-12
ghc: "8.8.4"
cabal: "3.10.1.0"
run-tests: true
- os: windows-latest
ghc: "8.8.4"
cabal: "3.10.1.0"
run-tests: true
outputs:
cabal-test-suites-json: ${{ steps.cabal-test-suites.outputs.targets-json }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ To build SAWScript and related utilities from source:
* Ensure that you have the `cabal` and `ghc` executables in your
`PATH`. If you don't already have them, we recommend using `ghcup`
to install them: <https://www.haskell.org/ghcup/>. We recommend
Cabal 3.4 or newer, and GHC 8.8, 8.10, or 9.2.
Cabal 3.4 or newer, and GHC 8.10, 9.2, or 9.4.

* Ensure that you have the C libraries and header files for
`terminfo`, which generally comes as part of `ncurses` on most
Expand Down
98 changes: 51 additions & 47 deletions cabal.GHC-8.10.7.config
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,23 @@ constraints: any.BoundedChan ==1.0.3.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.2.1,
aeson -cffi +ordered-keymap,
any.aeson-typescript ==0.4.2.0,
any.alex ==3.2.7.1,
any.ansi-terminal ==0.11.4,
any.aeson-typescript ==0.5.0.0,
any.alex ==3.2.7.3,
any.ansi-terminal ==0.11.5,
ansi-terminal -example,
any.ansi-terminal-types ==0.11.5,
any.ansi-wl-pprint ==0.6.9,
ansi-wl-pprint -example,
any.appar ==0.1.8,
any.arithmoi ==0.12.0.2,
any.arithmoi ==0.12.1.0,
any.array ==0.5.4.0,
any.asn1-encoding ==0.9.6,
any.asn1-parse ==0.9.5,
any.asn1-types ==0.3.4,
any.assoc ==1.0.2,
any.assoc ==1.1,
assoc +tagged,
any.async ==2.2.4,
async -bench,
any.attoparsec ==0.14.4,
Expand All @@ -44,12 +46,12 @@ constraints: any.BoundedChan ==1.0.3.0,
any.base16-bytestring ==1.0.2.0,
any.base64-bytestring ==1.2.1.0,
any.basement ==0.0.15,
any.bifunctors ==5.5.15,
bifunctors +semigroups +tagged,
any.bifunctors ==5.6.1,
bifunctors +tagged,
any.bimap ==0.5.0,
any.binary ==0.8.8.0,
any.binary-orphans ==1.0.4.1,
any.bitvec ==1.1.3.0,
any.bitvec ==1.1.4.0,
bitvec -libgmp,
any.bitwise ==1.0.0.1,
any.blaze-builder ==0.4.2.2,
Expand Down Expand Up @@ -117,7 +119,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.doctest ==0.20.1,
any.dotgen ==0.4.3,
dotgen -devel,
any.easy-file ==0.2.2,
any.easy-file ==0.2.3,
any.either ==5.0.2,
any.entropy ==0.4.1.10,
entropy -donotgetentropy,
Expand All @@ -126,22 +128,25 @@ constraints: any.BoundedChan ==1.0.3.0,
any.exceptions ==0.10.4,
any.executable-path ==0.0.3.1,
any.extensible-exceptions ==0.1.1.4,
any.extra ==1.7.12,
any.extra ==1.7.13,
any.fast-logger ==3.2.1,
any.fgl ==5.8.1.1,
fgl +containers042,
any.fgl-visualize ==0.1.0.1,
any.filelock ==0.1.1.5,
any.filelock ==0.1.1.6,
any.filemanip ==0.3.6.3,
any.filepath ==1.4.2.1,
any.fingertree ==0.1.5.0,
any.free ==5.1.10,
any.foldable1-classes-compat ==0.1,
foldable1-classes-compat +tagged,
any.free ==5.2,
any.generic-deriving ==1.14.3,
generic-deriving +base-4-9,
any.generic-lens ==2.2.1.0,
any.generic-lens ==2.2.2.0,
any.generic-lens-core ==2.2.1.0,
any.generic-random ==1.5.0.1,
generic-random -enable-inspect,
any.generically ==0.1.1,
any.ghc ==8.10.7,
any.ghc-boot ==8.10.7,
any.ghc-boot-th ==8.10.7,
Expand All @@ -154,14 +159,14 @@ constraints: any.BoundedChan ==1.0.3.0,
any.graphviz ==2999.20.1.0,
graphviz -test-parsing,
any.happy ==1.20.1.1,
any.hashable ==1.3.5.0,
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.haskell-lexer ==1.1.1,
any.haskell-src-exts ==1.23.1,
any.haskell-src-meta ==0.8.11,
any.haskell-src-meta ==0.8.12,
any.hedgehog ==1.2,
any.hedgehog-classes ==0.2.5.4,
hedgehog-classes +aeson +comonad +primitive +semirings +vector,
Expand All @@ -179,8 +184,8 @@ constraints: any.BoundedChan ==1.0.3.0,
any.hspec-expectations ==0.8.2,
any.http-date ==0.0.11,
any.http-types ==0.12.3,
any.http2 ==4.0.0,
http2 -devel -doc -h2spec,
any.http2 ==4.1.2,
http2 -devel -h2spec,
any.ieee754 ==0.8.0,
any.indexed-profunctors ==0.1.1,
any.indexed-traversable ==0.1.2.1,
Expand All @@ -194,38 +199,38 @@ constraints: any.BoundedChan ==1.0.3.0,
any.io-streams ==1.5.2.2,
io-streams +network -nointeractivetests +zlib,
any.iproute ==1.7.12,
any.itanium-abi ==0.1.1.1,
any.itanium-abi ==0.1.2,
any.js-chart ==2.9.4.1,
any.json ==0.10,
json +generic -mapdict +parsec +pretty +split-base,
any.kan-extensions ==5.2.5,
any.kvitable ==1.0.2.0,
any.kvitable ==1.0.2.1,
any.language-c99 ==0.2.0,
any.language-c99-simple ==0.2.2,
any.language-c99-util ==0.2.0,
language-rust +enablequasiquotes +usebytestrings,
any.lens ==5.1.1,
any.lens ==5.2.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.1,
libffi +ghc-bundled-libffi,
any.libyaml ==0.1.2,
libyaml -no-unicode -system-libyaml,
any.lifted-async ==0.10.2.3,
any.lifted-async ==0.10.2.4,
any.lifted-base ==0.2.3.12,
llvm-pretty-bc-parser -fuzz -regressions,
any.logict ==0.8.0.0,
any.lucid ==2.11.1,
any.lucid ==2.11.20230408,
any.lumberjack ==1.0.2.0,
any.math-functions ==0.3.4.2,
math-functions +system-erf +system-expm1,
any.megaparsec ==9.0.1,
any.megaparsec ==9.2.1,
megaparsec -dev,
any.memory ==0.18.0,
memory +support_bytestring +support_deepseq,
any.microlens ==0.4.13.1,
any.microlens-th ==0.4.3.11,
any.microlens-th ==0.4.3.12,
any.microstache ==1.0.2.3,
any.mmorph ==1.2.0,
any.mod ==0.1.2.2,
Expand Down Expand Up @@ -264,7 +269,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.prettyprinter ==1.7.1,
prettyprinter -buildreadme +text,
any.prettyprinter-ansi-terminal ==1.1.3,
any.primitive ==0.7.4.0,
any.primitive ==0.8.0.0,
any.process ==1.6.13.2,
any.profunctors ==5.6.2,
any.psqueues ==0.2.7.3,
Expand All @@ -280,17 +285,17 @@ constraints: any.BoundedChan ==1.0.3.0,
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,
any.s-cargot ==0.1.6.0,
s-cargot -build-example,
any.safe ==0.3.19,
any.safe-exceptions ==0.1.7.3,
any.sbv ==9.2,
any.scientific ==0.3.7.0,
scientific -bytestring-builder -integer-simple,
any.scotty ==0.12.1,
any.semialign ==1.2.0.1,
any.semialign ==1.3,
semialign +semigroupoids,
any.semigroupoids ==5.3.7,
semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
Expand All @@ -308,30 +313,29 @@ constraints: any.BoundedChan ==1.0.3.0,
any.split ==0.2.3.5,
any.splitmix ==0.1.0.4,
splitmix -optimised-mixer,
any.statistics ==0.16.1.2,
any.statistics ==0.16.2.0,
any.stm ==2.5.0.1,
any.streaming-commons ==0.2.2.5,
any.streaming-commons ==0.2.2.6,
streaming-commons -use-bytestring-builder,
any.strict ==0.4.0.1,
strict +assoc,
any.strict ==0.5,
any.string-interpolate ==0.3.2.0,
string-interpolate -bytestring-builder -extended-benchmarks -text-builder,
any.syb ==0.7.2.2,
any.syb ==0.7.2.3,
any.tagged ==0.8.7,
tagged +deepseq +transformers,
any.tasty ==1.4.3,
tasty +unix,
any.tasty-ant-xml ==1.1.8,
any.tasty-checklist ==1.0.5.0,
any.tasty-checklist ==1.0.6.0,
any.tasty-expected-failure ==0.12.3,
any.tasty-golden ==2.3.5,
tasty-golden -build-example,
any.tasty-hedgehog ==1.4.0.0,
any.tasty-hedgehog ==1.4.0.1,
any.tasty-hspec ==1.2.0.3,
any.tasty-hunit ==0.10.0.3,
any.tasty-quickcheck ==0.10.2,
any.tasty-smallcheck ==0.8.2,
any.tasty-sugar ==2.0.1.0,
any.tasty-sugar ==2.1.0.0,
any.template-haskell ==2.16.0.0,
any.temporary ==1.3,
any.terminal-size ==0.3.3,
Expand All @@ -351,8 +355,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.th-lift-instances ==0.1.20,
any.th-orphans ==0.13.14,
any.th-reify-many ==0.1.10,
any.these ==1.1.1.1,
these +assoc,
any.these ==1.2,
any.time ==1.9.3,
any.time-compat ==1.9.6.1,
time-compat -old-locale,
Expand All @@ -370,9 +373,9 @@ constraints: any.BoundedChan ==1.0.3.0,
any.unbounded-delays ==0.1.1.1,
any.uniplate ==1.6.13,
any.unix ==2.7.2.2,
any.unix-compat ==0.6,
any.unix-compat ==0.7,
unix-compat -old-time,
any.unix-time ==0.4.8,
any.unix-time ==0.4.9,
any.unliftio ==0.2.24.0,
any.unliftio-core ==0.2.1.0,
any.unordered-containers ==0.2.19.1,
Expand All @@ -382,22 +385,23 @@ constraints: any.BoundedChan ==1.0.3.0,
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.4,
any.versions ==5.0.5,
any.void ==0.7.3,
void -safe,
any.wai ==3.2.3,
any.wai-extra ==3.1.13.0,
wai-extra -build-example,
any.wai-logger ==2.4.0,
any.warp ==3.3.24,
any.warp ==3.3.25,
warp +allow-sendfilefd -network-bytestring -warp-debug +x509,
any.warp-tls ==3.3.5,
any.warp-tls ==3.3.6,
any.weigh ==0.0.16,
what4 -drealtestdisable -solvertests -stptestdisable,
any.witherable ==0.4.2,
Expand All @@ -414,4 +418,4 @@ constraints: any.BoundedChan ==1.0.3.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 2023-03-13T12:18:58Z
index-state: hackage.haskell.org 2023-04-18T11:48:49Z
Loading

0 comments on commit 48731f1

Please sign in to comment.