From 54f879314587a53c2e901f312d02d4991473be8b Mon Sep 17 00:00:00 2001 From: Tristan Ravitch Date: Tue, 24 May 2022 20:45:23 -0500 Subject: [PATCH] Submodule updates (#291) The primary changes are version bounds to let everything build against the latest what4 release (1.3) --- .github/update-freeze | 15 ----- .github/workflows/ci.yaml | 8 +-- cabal.project.freeze.ghc-8.10.7 | 99 ++++++++++++++++--------------- cabal.project.freeze.ghc-8.8.4 | 101 +++++++++++++++++--------------- cabal.project.freeze.ghc-9.0.2 | 85 ++++++++++++++++----------- deps/bv-sized | 2 +- deps/bv-sized-float | 2 +- deps/crucible | 2 +- deps/grift | 2 +- deps/llvm-pretty | 2 +- deps/llvm-pretty-bc-parser | 2 +- deps/what4 | 2 +- deps/what4-serialize | 2 +- macaw-semmc/macaw-semmc.cabal | 2 +- symbolic/macaw-symbolic.cabal | 2 +- 15 files changed, 171 insertions(+), 157 deletions(-) delete mode 100755 .github/update-freeze diff --git a/.github/update-freeze b/.github/update-freeze deleted file mode 100755 index ddb7b5f2..00000000 --- a/.github/update-freeze +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# Updates cabal.project freeze files -set -e - -if [ "$#" -ne 1 ]; then - echo "Usage: $0 " - echo "" - echo " For example, \"$0 8.10.4\"" - exit 1 -fi - -cabal update -ghcup set ghc $1 -cabal freeze --enable-tests --enable-benchmarks -mv cabal.project.freeze cabal.project.freeze.ghc-$1 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6ae1fdc6..129e6ec0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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: @@ -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: @@ -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 diff --git a/cabal.project.freeze.ghc-8.10.7 b/cabal.project.freeze.ghc-8.10.7 index 20905433..77b0dafb 100644 --- a/cabal.project.freeze.ghc-8.10.7 +++ b/cabal.project.freeze.ghc-8.10.7 @@ -4,6 +4,7 @@ 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, @@ -11,12 +12,11 @@ constraints: any.BoundedChan ==1.0.3.0, 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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -140,20 +145,20 @@ 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, @@ -161,7 +166,7 @@ constraints: any.BoundedChan ==1.0.3.0, 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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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 diff --git a/cabal.project.freeze.ghc-8.8.4 b/cabal.project.freeze.ghc-8.8.4 index 96ec02ec..b57596e3 100644 --- a/cabal.project.freeze.ghc-8.8.4 +++ b/cabal.project.freeze.ghc-8.8.4 @@ -4,6 +4,7 @@ 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, @@ -11,12 +12,11 @@ constraints: any.BoundedChan ==1.0.3.0, 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, @@ -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.13.0.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.7.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.10.1, 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.2.1, any.contravariant ==1.5.5, contravariant +semigroups +statevar +tagged, @@ -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, @@ -80,7 +81,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.dotgen ==0.4.3, dotgen -devel, any.erf ==2.0.0.0, - any.exceptions ==0.10.4, + any.exceptions ==0.10.5, exceptions +transformers-0-4, any.extra ==1.7.10, any.fgl ==5.7.0.3, @@ -88,9 +89,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.8.4, @@ -99,22 +100,26 @@ constraints: any.BoundedChan ==1.0.3.0, any.ghc-heap ==8.8.4, any.ghc-paths ==0.1.0.12, any.ghc-prim ==0.5.3, + 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.8.4, 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.0.3, 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, @@ -123,15 +128,15 @@ constraints: any.BoundedChan ==1.0.3.0, any.integer-gmp ==1.0.2.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, @@ -141,20 +146,20 @@ 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, @@ -162,7 +167,7 @@ constraints: any.BoundedChan ==1.0.3.0, 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, @@ -173,19 +178,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.9.0, 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, any.s-cargot ==0.1.4.0, s-cargot -build-example, @@ -195,12 +200,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, @@ -211,19 +217,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.15.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.0, any.text-short ==0.1.5, @@ -241,24 +247,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, @@ -268,7 +275,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 diff --git a/cabal.project.freeze.ghc-9.0.2 b/cabal.project.freeze.ghc-9.0.2 index b4e92f71..a405df4f 100644 --- a/cabal.project.freeze.ghc-9.0.2 +++ b/cabal.project.freeze.ghc-9.0.2 @@ -4,6 +4,7 @@ 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, @@ -11,12 +12,11 @@ constraints: any.BoundedChan ==1.0.3.0, 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, @@ -29,33 +29,36 @@ constraints: any.BoundedChan ==1.0.3.0, atomic-primops -debug, any.attoparsec ==0.14.4, attoparsec -developer, + any.barbies ==2.0.3.1, any.base ==4.15.1.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.boomerang ==1.4.8, any.bytestring ==0.10.12.1, 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.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.4.1, any.contravariant ==1.5.5, contravariant +semigroups +statevar +tagged, @@ -64,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.5.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, @@ -77,6 +80,7 @@ constraints: any.BoundedChan ==1.0.3.0, any.doctest ==0.20.0, any.dotgen ==0.4.3, dotgen -devel, + any.erf ==2.0.0.0, any.exceptions ==0.10.4, any.extra ==1.7.10, any.fgl ==5.7.0.3, @@ -84,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 ==9.0.2, @@ -102,19 +106,20 @@ constraints: any.BoundedChan ==1.0.3.0, ghc-typelits-natnormalise -deverror, any.ghci ==9.0.2, 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.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, @@ -123,32 +128,35 @@ constraints: any.BoundedChan ==1.0.3.0, any.integer-gmp ==1.1, 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, + any.lifted-async ==0.10.2.2, + any.lifted-base ==0.2.3.12, llvm-pretty-bc-parser -fuzz -regressions, 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.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.7, @@ -159,7 +167,7 @@ constraints: any.BoundedChan ==1.0.3.0, 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, @@ -170,18 +178,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.5, any.rts ==1.0.2, any.s-cargot ==0.1.4.0, s-cargot -build-example, @@ -197,6 +206,7 @@ constraints: any.BoundedChan ==1.0.3.0, 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, @@ -207,16 +217,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-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.17.0.0, any.temporary ==1.3, + any.terminal-size ==0.3.3, any.terminfo ==0.4.1.5, any.text ==1.2.5.0, any.text-short ==0.1.5, @@ -240,27 +253,29 @@ 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.5.4, + 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.2, + any.vector-th-unbox ==0.2.2, + any.versions ==5.0.3, any.void ==0.7.3, void -safe, any.wcwidth ==0.0.2, wcwidth -cli +split-base, what4 -drealtestdisable -solvertests -stptestdisable, any.witherable ==0.4.2, + 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-22T00:34:26Z +index-state: hackage.haskell.org 2022-05-23T21:04:04Z diff --git a/deps/bv-sized b/deps/bv-sized index 72e23063..57c5a039 160000 --- a/deps/bv-sized +++ b/deps/bv-sized @@ -1 +1 @@ -Subproject commit 72e230639e57d5ebdc066e309b7aad2e6cbdbb69 +Subproject commit 57c5a0399e3e2ebeaddc754e9b721056606c9b6e diff --git a/deps/bv-sized-float b/deps/bv-sized-float index 212be830..f18e76f2 160000 --- a/deps/bv-sized-float +++ b/deps/bv-sized-float @@ -1 +1 @@ -Subproject commit 212be830ea69a7f52d38cecd866793b97505bfff +Subproject commit f18e76f244a0f49f043873de650ebb92d1546d07 diff --git a/deps/crucible b/deps/crucible index e1308319..1d2d95d2 160000 --- a/deps/crucible +++ b/deps/crucible @@ -1 +1 @@ -Subproject commit e1308319eef8e0fcb55ed04df7eb2e9d5e87aac5 +Subproject commit 1d2d95d232eb2aae076d68021e1d75d322968595 diff --git a/deps/grift b/deps/grift index cb908438..d75a9801 160000 --- a/deps/grift +++ b/deps/grift @@ -1 +1 @@ -Subproject commit cb9084387fb919b33c852caeb2b796ca83c2e5cc +Subproject commit d75a980130a026a3561e7a98604fe3f7d4b13836 diff --git a/deps/llvm-pretty b/deps/llvm-pretty index ed904c67..64d43d93 160000 --- a/deps/llvm-pretty +++ b/deps/llvm-pretty @@ -1 +1 @@ -Subproject commit ed904c679d1a10ff98d1968da3407ff56cfa06a2 +Subproject commit 64d43d9375a819dc2a2df99fb98df24f049dcfaa diff --git a/deps/llvm-pretty-bc-parser b/deps/llvm-pretty-bc-parser index 062dc02b..cbcf0954 160000 --- a/deps/llvm-pretty-bc-parser +++ b/deps/llvm-pretty-bc-parser @@ -1 +1 @@ -Subproject commit 062dc02b2e5a1738a7f2e4f0b225b7c94c714a4d +Subproject commit cbcf0954c23da0018df3cc6aae77290ae2efe53b diff --git a/deps/what4 b/deps/what4 index 629f9f1d..835238d8 160000 --- a/deps/what4 +++ b/deps/what4 @@ -1 +1 @@ -Subproject commit 629f9f1d6fa586cef756e3cc65c130c14de34e17 +Subproject commit 835238d87500d48c3b0ae9121f2b484b71faa8b5 diff --git a/deps/what4-serialize b/deps/what4-serialize index 35f2877a..d8b3fa73 160000 --- a/deps/what4-serialize +++ b/deps/what4-serialize @@ -1 +1 @@ -Subproject commit 35f2877a3c04d17b133ac640a5e7035e507532a7 +Subproject commit d8b3fa73f7001614c593792aa082e13f4191e110 diff --git a/macaw-semmc/macaw-semmc.cabal b/macaw-semmc/macaw-semmc.cabal index c5548512..b646c9f5 100644 --- a/macaw-semmc/macaw-semmc.cabal +++ b/macaw-semmc/macaw-semmc.cabal @@ -39,7 +39,7 @@ library semmc, bv-sized >= 1 && < 1.1, libBF >= 0.6 && < 0.7, - what4 >= 1.1 && < 1.3 + what4 >= 1.1 && < 1.4 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall -Wcompat diff --git a/symbolic/macaw-symbolic.cabal b/symbolic/macaw-symbolic.cabal index c2e42e4c..c1a147fa 100644 --- a/symbolic/macaw-symbolic.cabal +++ b/symbolic/macaw-symbolic.cabal @@ -24,7 +24,7 @@ library text, vector, bytestring, - what4 >= 1.1 && < 1.3 + what4 >= 1.1 && < 1.4 hs-source-dirs: src