Skip to content

Commit

Permalink
Merge pull request #990 from RyanGlScott/ghc-8.10-support
Browse files Browse the repository at this point in the history
Support building with GHC 8.10 with a sprinkle of language extensions
  • Loading branch information
RyanGlScott authored Jan 6, 2021
2 parents 401cdd1 + 0cb8ff7 commit c0d8419
Show file tree
Hide file tree
Showing 4 changed files with 377 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
ghc: ["8.6.5", "8.8.4"]
ghc: ["8.6.5", "8.8.4", "8.10.2"]
continue-on-error: [false]
include:
- os: macos-latest
Expand Down Expand Up @@ -176,7 +176,7 @@ jobs:
- hmac-failure
- awslc
- blst
ghc: ["8.6.5", "8.8.4"]
ghc: ["8.6.5", "8.8.4", "8.10.2"]
steps:
- uses: actions/checkout@v2
- run: |
Expand Down
372 changes: 372 additions & 0 deletions cabal.GHC-8.10.2.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,372 @@
constraints: any.Cabal ==3.2.0.0,
any.FloatingHex ==0.5,
any.Glob ==0.10.1,
any.GraphSCC ==1.0.4,
GraphSCC -use-maps,
any.HUnit ==1.6.1.0,
any.IfElse ==0.85,
any.IntervalMap ==0.6.1.2,
any.MemoTrie ==0.6.10,
MemoTrie -examples,
any.MonadRandom ==0.5.2,
any.Only ==0.1,
any.QuickCheck ==2.14.2,
QuickCheck -old-random +templatehaskell,
any.StateVar ==1.2.1,
abcBridge -enable-extra-tests +enable-pthreads,
any.abstract-deque ==0.3,
abstract-deque -usecas,
any.abstract-par ==0.3.3,
any.adjunctions ==4.4,
any.aeson ==1.5.5.1,
aeson -bytestring-builder -cffi -developer -fast,
any.alex ==3.2.6,
alex +small_base,
any.ansi-terminal ==0.11,
ansi-terminal -example,
any.ansi-wl-pprint ==0.6.9,
ansi-wl-pprint -example,
any.appar ==0.1.8,
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.async ==2.2.2,
async -bench,
any.attoparsec ==0.13.2.4,
attoparsec -developer,
any.auto-update ==0.1.6,
any.base ==4.14.1.0,
any.base-compat ==0.11.2,
any.base-compat-batteries ==0.11.2,
any.base-orphans ==0.8.4,
any.base64-bytestring ==1.2.0.1,
any.basement ==0.0.11,
any.bifunctors ==5.5.7,
bifunctors +semigroups +tagged,
any.bimap ==0.4.0,
any.binary ==0.8.8.0,
any.binary-orphans ==1.0.1,
any.bitwise ==1.0.0.1,
any.blaze-builder ==0.4.1.0,
any.blaze-html ==0.9.1.2,
any.blaze-markup ==0.8.2.7,
any.boomerang ==1.4.6,
any.bsb-http-chunked ==0.0.0.4,
any.bv-sized ==1.0.2,
any.byteorder ==1.0.4,
any.bytestring ==0.10.10.0,
any.bytestring-builder ==0.10.8.2.0,
bytestring-builder +bytestring_has_builder,
any.c2hs ==0.28.7,
c2hs +base3 -regression,
any.cabal-doctest ==1.0.8,
any.call-stack ==0.2.0,
any.case-insensitive ==1.2.1.0,
any.cassava ==0.5.2.0,
cassava -bytestring--lt-0_10_4,
any.cereal ==0.5.8.1,
cereal -bytestring-builder,
any.clock ==0.8,
clock -llvm,
any.cmdargs ==0.10.20,
cmdargs +quotation -testprog,
any.code-page ==0.2,
any.colour ==2.3.5,
any.comonad ==5.0.8,
comonad +containers +distributive +indexed-traversable,
any.concurrent-output ==1.10.12,
any.conduit ==1.3.4,
any.conduit-extra ==1.3.5,
any.config-schema ==1.2.1.0,
any.config-value ==0.8.1,
any.constraints ==0.12,
any.containers ==0.6.2.1,
any.contravariant ==1.5.3,
contravariant +semigroups +statevar +tagged,
any.cookie ==0.4.5,
any.crackNum ==2.4,
any.criterion ==1.5.9.0,
criterion -embed-data-files -fast,
any.criterion-measurement ==0.1.2.0,
criterion-measurement -fast,
crucible +unsafe-operations,
any.cryptohash-md5 ==0.11.100.1,
any.cryptohash-sha1 ==0.11.100.1,
cryptol +relocatable -static,
cryptol-saw-core +build-css,
any.cryptonite ==0.27,
cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes,
any.cryptonite-conduit ==0.2.2,
any.data-accessor ==0.2.3,
data-accessor +category +monadfail +splitbase,
any.data-binary-ieee754 ==0.4.4,
any.data-default-class ==0.1.2.0,
any.data-fix ==0.3.0,
any.data-inttrie ==0.1.4,
any.data-ref ==0.0.2,
any.deepseq ==1.4.4.0,
any.dense-linear-algebra ==0.1.0.0,
any.deriving-compat ==0.5.9,
deriving-compat +base-4-9 +new-functor-classes +template-haskell-2-11,
any.directory ==1.3.6.0,
any.distributive ==0.6.2.1,
distributive +semigroups +tagged,
any.dlist ==1.0,
dlist -werror,
any.doctest ==0.16.3,
any.dotgen ==0.4.3,
dotgen -devel,
any.easy-file ==0.2.2,
any.either ==5.0.1.1,
any.entropy ==0.4.1.6,
entropy -halvm,
any.erf ==2.0.0.0,
any.exceptions ==0.10.4,
any.executable-path ==0.0.3.1,
any.extra ==1.7.9,
any.fail ==4.9.0.0,
any.fast-logger ==3.0.2,
any.fgl ==5.7.0.3,
fgl +containers042,
any.fgl-visualize ==0.1.0.1,
any.filelock ==0.1.1.5,
any.filemanip ==0.3.6.3,
any.filepath ==1.4.2.1,
any.fingertree ==0.1.4.2,
any.free ==5.1.3,
any.generic-deriving ==1.13.1,
generic-deriving +base-4-9,
any.generic-random ==1.3.0.1,
any.ghc ==8.10.2,
any.ghc-boot ==8.10.2,
any.ghc-boot-th ==8.10.2,
any.ghc-heap ==8.10.2,
any.ghc-paths ==0.1.0.12,
any.ghc-prim ==0.6.1,
any.ghci ==8.10.2,
any.gitrev ==1.3.1,
any.happy ==1.20.0,
any.hashable ==1.3.0.0,
hashable -examples +integer-gmp +sse2 -sse41,
any.hashtables ==1.2.4.1,
hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks,
any.haskeline ==0.8.0.1,
any.haskell-lexer ==1.1,
any.haskell-src-exts ==1.23.1,
any.haskell-src-meta ==0.8.5,
any.hedgehog ==1.0.4,
any.heredoc ==0.2.0.0,
any.hourglass ==0.2.12,
any.hpc ==0.6.1.0,
any.hsc2hs ==0.68.7,
hsc2hs -in-ghc-tree,
any.hspec ==2.7.5,
any.hspec-core ==2.7.5,
any.hspec-discover ==2.7.5,
any.hspec-expectations ==0.8.2,
any.http-date ==0.0.10,
any.http-types ==0.12.3,
any.http2 ==2.0.5,
http2 -devel,
any.indexed-traversable ==0.1.1,
any.integer-gmp ==1.0.3.0,
any.integer-logarithms ==1.0.3.1,
integer-logarithms -check-bounds +integer-gmp,
any.interpolate ==0.2.1,
any.invariant ==0.5.3,
any.io-streams ==1.5.2.0,
io-streams +network -nointeractivetests +zlib,
any.iproute ==1.7.10,
any.itanium-abi ==0.1.1.1,
any.js-chart ==2.9.4.1,
any.json ==0.10,
json +generic -mapdict +parsec +pretty +split-base,
jvm-verifier +build-benchmarks -build-examples +build-jss -build-jvmgraph +build-library +builtin-abc,
any.kan-extensions ==5.2.1,
any.language-c ==0.8.3,
language-c -allwarnings +iecfpextension +separatesyb +usebytestrings,
any.lens ==4.19.2,
lens -benchmark-uniplate -dump-splices +inlining -j -old-inline-pragmas -safe +test-doctests +test-hunit +test-properties +test-templates +trustworthy,
any.libBF ==0.5.1,
any.libyaml ==0.1.2,
libyaml -no-unicode -system-libyaml,
any.lifted-async ==0.10.1.2,
any.lifted-base ==0.2.3.12,
llvm-pretty-bc-parser -fuzz -regressions,
any.logict ==0.7.0.3,
any.math-functions ==0.3.4.1,
math-functions +system-erf +system-expm1,
any.megaparsec ==9.0.1,
megaparsec -dev,
any.memory ==0.15.0,
memory +support_basement +support_bytestring +support_deepseq +support_foundation,
any.microlens ==0.4.12.0,
any.microlens-th ==0.4.3.6,
any.microstache ==1.0.1.2,
any.mmorph ==1.1.3,
any.modern-uri ==0.3.3.0,
modern-uri -dev,
any.monad-control ==1.0.2.3,
any.monad-par ==0.3.5,
monad-par -chaselev -newgeneric,
any.monad-par-extras ==0.3.3,
any.monadLib ==3.10,
any.mono-traversable ==1.0.15.1,
any.mtl ==2.2.2,
any.mwc-random ==0.15.0.1,
any.nats ==1.1.2,
nats +binary +hashable +template-haskell,
any.network ==3.1.2.1,
network -devel,
any.network-byte-order ==0.1.6,
any.network-info ==0.2.0.10,
any.newtype-generics ==0.5.4,
any.old-locale ==1.0.0.7,
any.old-time ==1.1.0.3,
any.optparse-applicative ==0.16.1.0,
optparse-applicative +process,
any.panic ==0.4.0.1,
any.parallel ==3.2.2.0,
parameterized-utils +unsafe-operations,
any.parsec ==3.1.14.0,
any.parser-combinators ==1.2.1,
parser-combinators -dev,
any.pem ==0.2.4,
any.pretty ==1.1.3.6,
any.pretty-hex ==1.1,
any.pretty-show ==1.10,
any.prettyprinter ==1.7.0,
prettyprinter -buildreadme,
any.prettyprinter-ansi-terminal ==1.1.2,
any.primitive ==0.7.1.0,
any.process ==1.6.9.0,
any.profunctors ==5.6,
any.psqueues ==0.2.7.2,
any.quickcheck-instances ==0.3.25.2,
quickcheck-instances -bytestring-builder,
any.quickcheck-io ==0.2.0,
any.random ==1.2.0,
any.raw-strings-qq ==1.1,
any.reducers ==3.12.3,
any.reflection ==2.1.6,
reflection -slow +template-haskell,
any.regex-base ==0.94.0.0,
any.regex-compat ==0.95.2.0,
any.regex-posix ==0.96.0.0,
regex-posix -_regex-posix-clib,
any.resourcet ==1.2.4.2,
any.rts ==1.0,
any.safe ==0.3.19,
saw-remote-api +builtin-abc,
saw-script +builtin-abc,
any.sbv ==8.7,
sbv -skiphlinttester,
any.scientific ==0.3.6.2,
scientific -bytestring-builder -integer-simple,
any.scotty ==0.12,
any.semigroupoids ==5.3.4,
semigroupoids +comonad +containers +contravariant +distributive +doctests +tagged +unordered-containers,
any.semigroups ==0.19.1,
semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers,
any.setenv ==0.1.1.3,
any.silently ==1.2.5.1,
any.simple-get-opt ==0.4,
any.simple-sendfile ==0.2.30,
simple-sendfile +allow-bsd,
any.simple-smt ==0.9.5,
any.smallcheck ==1.2.0,
any.split ==0.2.3.4,
any.splitmix ==0.1.0.3,
splitmix -optimised-mixer,
any.statistics ==0.15.2.0,
any.stm ==2.5.0.0,
any.streaming-commons ==0.2.2.1,
streaming-commons -use-bytestring-builder,
any.strict ==0.4.0.1,
strict +assoc,
any.syb ==0.7.1,
any.tagged ==0.8.6.1,
tagged +deepseq +transformers,
any.tasty ==1.4.0.2,
tasty +clock +unix,
any.tasty-ant-xml ==1.0.0.5,
any.tasty-golden ==2.3.4,
tasty-golden -build-example,
any.tasty-hedgehog ==1.0.0.2,
any.tasty-hspec ==1.1.6,
any.tasty-hunit ==0.10.0.3,
any.tasty-quickcheck ==0.10.1.2,
any.tasty-smallcheck ==0.8.2,
any.template-haskell ==2.16.0.0,
any.temporary ==1.3,
any.terminal-size ==0.3.2.1,
any.terminfo ==0.4.1.4,
any.text ==1.2.3.2,
any.text-short ==0.1.3,
text-short -asserts,
any.tf-random ==0.5,
any.th-abstraction ==0.3.2.0,
any.th-compat ==0.1,
any.th-expand-syns ==0.4.6.0,
any.th-lift ==0.8.2,
any.th-lift-instances ==0.1.18,
any.th-orphans ==0.13.11,
any.th-reify-many ==0.1.9,
any.these ==1.1.1.1,
these +assoc,
any.time ==1.9.3,
any.time-compat ==1.9.5,
time-compat -old-locale,
any.time-manager ==0.0.0,
any.transformers ==0.5.6.2,
any.transformers-base ==0.4.5.2,
transformers-base +orphaninstances,
any.transformers-compat ==0.6.6,
transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
any.type-equality ==1,
any.typed-process ==0.2.6.0,
any.unbounded-delays ==0.1.1.1,
any.uniplate ==1.6.13,
any.unix ==2.7.2.2,
any.unix-compat ==0.5.2,
unix-compat -old-time,
any.unix-time ==0.4.7,
any.unliftio-core ==0.2.0.1,
any.unordered-containers ==0.2.13.0,
unordered-containers -debug,
any.utf8-string ==1.0.2,
any.uuid ==1.3.13,
any.uuid-types ==1.0.3,
any.vault ==0.3.1.4,
vault +useghc,
any.vector ==0.12.1.2,
vector +boundschecks -internalchecks -unsafechecks -wall,
any.vector-algorithms ==0.8.0.4,
vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks,
any.vector-binary-instances ==0.2.5.1,
any.vector-th-unbox ==0.2.1.7,
any.versions ==3.5.4,
any.void ==0.7.3,
void -safe,
any.wai ==3.2.2.1,
any.wai-extra ==3.1.5,
wai-extra -build-example,
any.wai-logger ==2.3.6,
any.warp ==3.3.13,
warp +allow-sendfilefd -network-bytestring -warp-debug,
any.wcwidth ==0.0.2,
wcwidth -cli +split-base,
what4 -drealtestdisable -solvertests -stptestdisable,
any.wl-pprint-annotated ==0.1.0.1,
any.word8 ==0.1.3,
any.x509 ==1.7.5,
any.xdg-basedir ==0.2.2,
any.xml ==1.3.14,
any.yaml ==0.11.5.0,
yaml +no-examples +no-exe,
any.zenc ==0.1.1,
any.zlib ==0.6.2.2,
zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
any.zlib-bindings ==0.1.1.5
2 changes: 2 additions & 0 deletions src/SAWScript/Crucible/JVM/BuiltinsJVM.hs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Stability : provisional
-}


{-# LANGUAGE GADTs #-}
{-# LANGUAGE NoMonoLocalBinds #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE EmptyCase #-}
{-# LANGUAGE PackageImports #-}
Expand Down
Loading

0 comments on commit c0d8419

Please sign in to comment.