Skip to content

Commit

Permalink
Submodule updates
Browse files Browse the repository at this point in the history 
The primary changes are version bounds to let everything build against the
latest what4 release (1.3)
  • Loading branch information
@travitch
travitch committed May 24, 2022
1 parent 659cfff commit da4c6b3
Show file tree
Hide file tree
Showing 15 changed files with 171 additions and 157 deletions.
15 changes: 0 additions & 15 deletions .github/update-freeze
View file

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
# (e.g. cabal complains it can't find a valid version of the "happy"
# tool).
env:
CACHE_VERSION: 1
CACHE_VERSION: 3

jobs:
build-linux:
Expand All @@ -21,7 +21,6 @@ jobs:
LC_ALL: en_US.UTF-8
TZ: America/Los_Angeles
CI_TEST_LEVEL: "2"
CACHE_VERSION: 2

runs-on: ${{ matrix.os }}
strategy:
Expand Down Expand Up @@ -81,8 +80,9 @@ jobs:
# steps are less verbose and major dependency failures are separate.
- name: Cabal dependencies
run: |
cabal build --only-dependencies macaw-base
cabal build crucible-llvm
cabal configure --enable-tests all
cabal build -j --only-dependencies pkg:macaw-base
cabal build -j pkg:crucible-llvm pkg:dismantle-ppc pkg:dismantle-arm-xml
- name: Install Solvers
if: runner.os == 'Linux'
run: .github/ci.sh install_system_deps
Expand Down
99 changes: 53 additions & 46 deletions cabal.project.freeze.ghc-8.10.7
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ constraints: any.BoundedChan ==1.0.3.0,
any.Glob ==0.10.2,
any.HUnit ==1.6.2.0,
any.IntervalMap ==0.6.1.2,
any.MonadRandom ==0.5.3,
any.OneTuple ==0.3.1,
any.Only ==0.1,
any.QuickCheck ==2.14.2,
QuickCheck -old-random +templatehaskell,
any.SHA ==1.6.4.4,
SHA -exe,
any.StateVar ==1.2.2,
any.adjunctions ==4.4,
any.adjunctions ==4.4.1,
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 @@ -27,37 +27,38 @@ constraints: any.BoundedChan ==1.0.3.0,
async -bench,
any.atomic-primops ==0.8.4,
atomic-primops -debug,
any.attoparsec ==0.14.3,
any.attoparsec ==0.14.4,
attoparsec -developer,
any.barbies ==2.0.3.1,
any.base ==4.14.3.0,
any.base-compat ==0.12.1,
any.base-compat-batteries ==0.12.1,
any.base-orphans ==0.8.6,
any.base16-bytestring ==1.0.2.0,
any.bifunctors ==5.5.11,
any.bifunctors ==5.5.12,
bifunctors +semigroups +tagged,
any.bimap ==0.4.0,
any.bimap ==0.5.0,
any.binary ==0.8.8.0,
any.bitwise ==1.0.0.1,
any.blaze-builder ==0.4.2.2,
any.blaze-textual ==0.2.2.1,
blaze-textual -developer -integer-simple +native,
any.boomerang ==1.4.7,
any.bv-sized ==1.0.3.99,
any.boomerang ==1.4.8,
any.bytestring ==0.10.12.0,
any.call-stack ==0.4.0,
any.case-insensitive ==1.2.1.0,
any.cereal ==0.5.8.2,
cereal -bytestring-builder,
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.concurrent-output ==1.10.14,
any.config-value ==0.8.2,
any.constraints ==0.13.2,
any.concurrent-extra ==0.7.0.12,
any.concurrent-output ==1.10.16,
any.config-value ==0.8.2.1,
any.constraints ==0.13.4,
any.containers ==0.6.5.1,
any.contravariant ==1.5.5,
contravariant +semigroups +statevar +tagged,
Expand All @@ -66,7 +67,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.data-default-class ==0.1.2.0,
any.data-fix ==0.3.2,
any.deepseq ==1.4.4.0,
any.deriving-compat ==0.6,
any.deriving-compat ==0.6.1,
deriving-compat +base-4-9 +new-functor-classes +template-haskell-2-11,
any.direct-sqlite ==2.3.26,
direct-sqlite +fulltextsearch +haveusleep +json1 -systemlib +urifilenames,
Expand All @@ -87,9 +88,9 @@ constraints: any.BoundedChan ==1.0.3.0,
any.fgl-visualize ==0.1.0.1,
any.filemanip ==0.3.6.3,
any.filepath ==1.4.2.1,
any.fingertree ==0.1.4.2,
any.fingertree ==0.1.5.0,
any.finite-typelits ==0.1.4.2,
any.free ==5.1.7,
any.free ==5.1.8,
any.generic-random ==1.5.0.1,
generic-random -enable-inspect,
any.ghc ==8.10.7,
Expand All @@ -98,22 +99,26 @@ constraints: any.BoundedChan ==1.0.3.0,
any.ghc-heap ==8.10.7,
any.ghc-paths ==0.1.0.12,
any.ghc-prim ==0.6.1,
any.ghc-tcplugins-extra ==0.4.2,
ghc-tcplugins-extra -deverror,
any.ghc-typelits-natnormalise ==0.7.6,
ghc-typelits-natnormalise -deverror,
any.ghci ==8.10.7,
any.gitrev ==1.3.1,
any.haggle ==0.1.0.1,
any.haggle ==0.2,
any.happy ==1.20.0,
any.hashable ==1.3.5.0,
hashable +integer-gmp -random-initial-seed,
any.hashtables ==1.2.4.2,
hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks,
any.haskell-lexer ==1.1,
any.hedgehog ==1.0.5,
any.hedgehog ==1.1.1,
any.hpc ==0.6.1.0,
any.hsc2hs ==0.68.8,
hsc2hs -in-ghc-tree,
any.hspec ==2.9.4,
any.hspec-core ==2.9.4,
any.hspec-discover ==2.9.4,
any.hspec ==2.10.0,
any.hspec-core ==2.10.0,
any.hspec-discover ==2.10.0,
any.hspec-expectations ==0.8.2,
any.ilist ==0.4.0.1,
any.indexed-list-literals ==0.2.1.3,
Expand All @@ -122,15 +127,15 @@ constraints: any.BoundedChan ==1.0.3.0,
any.integer-gmp ==1.0.3.0,
any.integer-logarithms ==1.0.3.1,
integer-logarithms -check-bounds +integer-gmp,
any.invariant ==0.5.5,
any.invariant ==0.5.6,
any.io-streams ==1.5.2.1,
io-streams +network -nointeractivetests +zlib,
any.itanium-abi ==0.1.1.1,
any.json ==0.10,
json +generic -mapdict +parsec +pretty +split-base,
any.kan-extensions ==5.2.3,
any.kan-extensions ==5.2.4,
any.kvitable ==1.0.0.0,
any.lens ==5.0.1,
any.lens ==5.1.1,
lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy,
any.libBF ==0.6.3,
libBF -system-libbf,
Expand All @@ -140,28 +145,28 @@ constraints: any.BoundedChan ==1.0.3.0,
any.located-base ==0.1.1.1,
any.logict ==0.7.0.3,
any.lucid ==2.9.12.1,
any.lumberjack ==1.0.0.1,
any.lumberjack ==1.0.1.0,
any.math-functions ==0.3.4.2,
math-functions +system-erf +system-expm1,
any.megaparsec ==8.0.0,
megaparsec -dev,
any.microlens ==0.4.12.0,
any.microlens ==0.4.13.0,
any.microlens-th ==0.4.3.10,
any.mmorph ==1.1.5,
any.mmorph ==1.2.0,
any.monad-control ==1.0.3.1,
any.monad-primitive ==0.1,
any.monadLib ==3.10,
any.monadLib ==3.10.1,
any.mtl ==2.2.2,
any.mwc-random ==0.14.0.0,
any.network ==3.1.2.5,
any.network ==3.1.2.7,
network -devel,
any.old-locale ==1.0.0.7,
any.optparse-applicative ==0.16.1.0,
optparse-applicative +process,
any.ordered-containers ==0.2.2,
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 @@ -172,19 +177,19 @@ 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.3.0,
any.primitive ==0.7.4.0,
any.process ==1.6.13.2,
any.profunctors ==5.6.2,
any.pvar ==1.0.0.0,
any.quickcheck-io ==0.2.0,
any.random ==1.2.1,
any.random ==1.2.1.1,
any.ref-tf ==0.5.0.1,
any.reflection ==2.1.6,
reflection -slow +template-haskell,
any.regex-base ==0.94.0.2,
any.regex-tdfa ==1.3.1.1,
any.regex-tdfa ==1.3.1.2,
regex-tdfa -force-o2,
any.resourcet ==1.2.4.3,
any.resourcet ==1.2.5,
any.rts ==1.0.1,
any.s-cargot ==0.1.4.0,
s-cargot -build-example,
Expand All @@ -194,12 +199,13 @@ constraints: any.BoundedChan ==1.0.3.0,
scientific -bytestring-builder -integer-simple,
any.semialign ==1.2.0.1,
semialign +semigroupoids,
any.semigroupoids ==5.3.6,
any.semigroupoids ==5.3.7,
semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
any.semigroups ==0.19.2,
semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers,
any.setenv ==0.1.1.3,
any.smallcheck ==1.2.1,
softfloat-hs +usebundledc,
any.split ==0.2.3.4,
any.splitmix ==0.1.0.4,
splitmix -optimised-mixer,
Expand All @@ -210,19 +216,19 @@ constraints: any.BoundedChan ==1.0.3.0,
any.syb ==0.7.2.1,
any.tagged ==0.8.6.1,
tagged +deepseq +transformers,
any.tasty ==1.4.2.1,
any.tasty ==1.4.2.3,
tasty +clock +unix,
any.tasty-checklist ==1.0.3.0,
any.tasty-expected-failure ==0.12.3,
any.tasty-hedgehog ==1.1.0.0,
any.tasty-hspec ==1.2,
any.tasty-hedgehog ==1.2.0.0,
any.tasty-hspec ==1.2.0.1,
any.tasty-hunit ==0.10.0.3,
any.tasty-quickcheck ==0.10.2,
any.tasty-smallcheck ==0.8.2,
any.tasty-sugar ==1.1.1.0,
any.template-haskell ==2.16.0.0,
any.temporary ==1.3,
any.terminal-size ==0.3.2.1,
any.terminal-size ==0.3.3,
any.terminfo ==0.4.1.4,
any.text ==1.2.4.1,
any.text-short ==0.1.5,
Expand All @@ -240,24 +246,25 @@ constraints: any.BoundedChan ==1.0.3.0,
any.transformers ==0.5.6.2,
any.transformers-base ==0.4.6,
transformers-base +orphaninstances,
any.transformers-compat ==0.6.6,
any.transformers-compat ==0.7.1,
transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
any.type-equality ==1,
any.unbounded-delays ==0.1.1.1,
any.uniplate ==1.6.13,
any.unix ==2.7.2.2,
any.unix-compat ==0.5.3,
any.unix-compat ==0.6,
unix-compat -old-time,
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-types ==1.0.5,
any.vector ==0.12.3.1,
vector +boundschecks -internalchecks -unsafechecks -wall,
any.vector-sized ==1.5.0,
any.versions ==5.0.1,
any.vector-th-unbox ==0.2.2,
any.versions ==5.0.3,
any.void ==0.7.3,
void -safe,
any.wcwidth ==0.0.2,
Expand All @@ -267,7 +274,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.wl-pprint-annotated ==0.1.0.1,
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-01-06T13:38:03Z
index-state: hackage.haskell.org 2022-05-23T21:04:04Z
Loading

0 comments on commit da4c6b3

Please sign in to comment.