mirror of
https://github.com/GaloisInc/macaw.git
synced 2024-11-29 21:44:11 +03:00
Merge pull request #138 from GaloisInc/release_2_1_0
Update submodules for parameterized-utils release 2.1.0 compatibility.
This commit is contained in:
Kevin Quick
GitHub
commit
162d7f0c2c
34
.travis.yml
34
.travis.yml
@ -1,36 +1,28 @@
|
||||
sudo: false
|
||||
language: minimal
|
||||
|
||||
language: haskell
|
||||
cabal: 2.4
|
||||
ghc:
|
||||
- 8.4.4
|
||||
- 8.6.5
|
||||
|
||||
git:
|
||||
submodules: false # whether to recursively clone submodules
|
||||
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.stack
|
||||
- $HOME/.ghc
|
||||
- $HOME/.cabal
|
||||
|
||||
matrix:
|
||||
include:
|
||||
- env: STACK_YAML=stack-8.4.yaml
|
||||
- env: STACK_YAML=stack-8.6.yaml
|
||||
|
||||
before_install:
|
||||
install:
|
||||
# Changes ssh paths into http path, so that we can do a read-only clone of
|
||||
# our submodules without worrying about ssh keys.
|
||||
- sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
|
||||
- git submodule update --init
|
||||
- cabal v2-update --project-file=cabal.project.dist
|
||||
|
||||
# Download and unpack the stack executable
|
||||
- mkdir -p $HOME/.local/bin
|
||||
- export PATH=$HOME/.local/bin:$PATH
|
||||
- travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
|
||||
|
||||
install:
|
||||
- travis_wait stack --no-terminal setup
|
||||
|
||||
script:
|
||||
# Here starts the actual work to be performed for the package under test;
|
||||
# any command which exits with a non-zero exit code causes the build to fail.
|
||||
# Build packages
|
||||
- stack build --ghc-options="-Wall -Werror"
|
||||
# Run tests
|
||||
- stack test macaw-x86 macaw-x86-symbolic --ghc-options="-Wall -Werror"
|
||||
# It would be good to build documentation, but it currently seems to take too long.
|
||||
# - stack haddock
|
||||
- cabal v2-test --project-file=cabal.project.dist x86 x86_symbolic
|
||||
|
||||
240
cabal.project.dist.ghc883.freeze
Normal file
240
cabal.project.dist.ghc883.freeze
Normal file
@ -0,0 +1,240 @@
|
||||
constraints: any.BoundedChan ==1.0.3.0,
|
||||
any.Cabal ==3.0.1.0,
|
||||
any.HUnit ==1.6.0.0,
|
||||
any.IntervalMap ==0.6.1.1,
|
||||
any.Only ==0.1,
|
||||
any.QuickCheck ==2.14,
|
||||
QuickCheck +templatehaskell,
|
||||
any.SHA ==1.6.4.4,
|
||||
SHA -exe,
|
||||
any.StateVar ==1.2,
|
||||
any.adjunctions ==4.4,
|
||||
any.ansi-terminal ==0.10.3,
|
||||
ansi-terminal -example,
|
||||
any.ansi-wl-pprint ==0.6.9,
|
||||
ansi-wl-pprint -example,
|
||||
any.array ==0.5.4.0,
|
||||
asl-translator -asl-lite +unsafe-operations,
|
||||
any.async ==2.2.2,
|
||||
async -bench,
|
||||
any.atomic-primops ==0.8.3,
|
||||
atomic-primops -debug,
|
||||
any.attoparsec ==0.13.2.4,
|
||||
attoparsec -developer,
|
||||
any.base ==4.13.0.0,
|
||||
any.base-compat ==0.11.1,
|
||||
any.base-orphans ==0.8.2,
|
||||
any.base16-bytestring ==0.1.1.6,
|
||||
any.bifunctors ==5.5.7,
|
||||
bifunctors +semigroups +tagged,
|
||||
any.bimap ==0.4.0,
|
||||
any.binary ==0.8.7.0,
|
||||
any.bitwise ==1.0.0.1,
|
||||
any.blaze-builder ==0.4.1.0,
|
||||
any.blaze-textual ==0.2.1.0,
|
||||
blaze-textual -developer -integer-simple +native,
|
||||
any.boomerang ==1.4.6,
|
||||
any.bv-sized ==1.0.1,
|
||||
any.bytestring ==0.10.10.0,
|
||||
any.bytestring-builder ==0.10.8.2.0,
|
||||
bytestring-builder +bytestring_has_builder,
|
||||
any.cabal-doctest ==1.0.8,
|
||||
any.call-stack ==0.2.0,
|
||||
any.case-insensitive ==1.2.1.0,
|
||||
any.cereal ==0.5.8.1,
|
||||
cereal -bytestring-builder,
|
||||
any.clock ==0.8,
|
||||
clock -llvm,
|
||||
any.code-page ==0.2,
|
||||
any.colour ==2.3.5,
|
||||
any.comonad ==5.0.6,
|
||||
comonad +containers +distributive +test-doctests,
|
||||
any.concurrent-output ==1.10.11,
|
||||
any.constraints ==0.11.2,
|
||||
any.containers ==0.6.2.1,
|
||||
any.contravariant ==1.5.2,
|
||||
contravariant +semigroups +statevar +tagged,
|
||||
crucible +unsafe-operations,
|
||||
any.data-binary-ieee754 ==0.4.4,
|
||||
any.data-default-class ==0.1.2.0,
|
||||
any.deepseq ==1.4.4.0,
|
||||
any.deriving-compat ==0.5.8,
|
||||
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,
|
||||
any.directory ==1.3.6.0,
|
||||
dismantle-arm-xml -asl-lite,
|
||||
any.distributive ==0.6.2,
|
||||
distributive +semigroups +tagged,
|
||||
any.doctest ==0.16.3,
|
||||
any.dotgen ==0.4.2,
|
||||
dotgen -devel,
|
||||
any.erf ==2.0.0.0,
|
||||
any.exceptions ==0.10.4,
|
||||
exceptions +transformers-0-4,
|
||||
any.extra ==1.7.1,
|
||||
any.fail ==4.9.0.0,
|
||||
any.fgl ==5.7.0.2,
|
||||
fgl +containers042,
|
||||
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.finite-typelits ==0.1.4.2,
|
||||
any.free ==5.1.3,
|
||||
any.generic-random ==1.3.0.1,
|
||||
any.ghc ==8.8.3,
|
||||
any.ghc-boot ==8.8.3,
|
||||
any.ghc-boot-th ==8.8.3,
|
||||
any.ghc-heap ==8.8.3,
|
||||
any.ghc-paths ==0.1.0.12,
|
||||
any.ghc-prim ==0.5.3,
|
||||
any.ghci ==8.8.3,
|
||||
any.gitrev ==1.3.1,
|
||||
any.haggle ==0.1.0.0,
|
||||
any.happy ==1.19.12,
|
||||
happy +small_base,
|
||||
any.hashable ==1.3.0.0,
|
||||
hashable -examples +integer-gmp +sse2 -sse41,
|
||||
any.hashtables ==1.2.3.4,
|
||||
hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks,
|
||||
any.haskell-lexer ==1.1,
|
||||
any.hedgehog ==1.0.2,
|
||||
any.hpc ==0.6.0.3,
|
||||
any.hsc2hs ==0.68.7,
|
||||
hsc2hs -in-ghc-tree,
|
||||
any.hspec ==2.7.1,
|
||||
any.hspec-core ==2.7.1,
|
||||
any.hspec-discover ==2.7.1,
|
||||
any.hspec-expectations ==0.8.2,
|
||||
any.ilist ==0.4.0.1,
|
||||
any.indexed-list-literals ==0.2.1.3,
|
||||
any.integer-gmp ==1.0.2.0,
|
||||
any.integer-logarithms ==1.0.3,
|
||||
integer-logarithms -check-bounds +integer-gmp,
|
||||
any.invariant ==0.5.3,
|
||||
any.io-streams ==1.5.1.0,
|
||||
io-streams -nointeractivetests,
|
||||
any.itanium-abi ==0.1.1.1,
|
||||
any.json ==0.10,
|
||||
json +generic -mapdict +parsec +pretty +split-base,
|
||||
any.kan-extensions ==5.2,
|
||||
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.lifted-async ==0.10.0.6,
|
||||
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.2,
|
||||
any.lumberjack ==0.1.0.2,
|
||||
any.math-functions ==0.3.4.0,
|
||||
math-functions +system-erf +system-expm1,
|
||||
any.megaparsec ==7.0.5,
|
||||
megaparsec -dev,
|
||||
any.microlens ==0.4.11.2,
|
||||
any.microlens-th ==0.4.3.5,
|
||||
any.mmorph ==1.1.3,
|
||||
any.monad-control ==1.0.2.3,
|
||||
any.monad-primitive ==0.1,
|
||||
any.monadLib ==3.10,
|
||||
any.mtl ==2.2.2,
|
||||
any.mwc-random ==0.14.0.0,
|
||||
any.network ==3.1.1.1,
|
||||
any.old-locale ==1.0.0.7,
|
||||
any.optparse-applicative ==0.15.1.0,
|
||||
any.ordered-containers ==0.2.2,
|
||||
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.pretty ==1.1.3.6,
|
||||
any.pretty-hex ==1.1,
|
||||
any.pretty-show ==1.10,
|
||||
any.prettyprinter ==1.6.1,
|
||||
prettyprinter -buildreadme,
|
||||
any.prettyprinter-ansi-terminal ==1.1.1.2,
|
||||
any.primitive ==0.7.0.1,
|
||||
any.process ==1.6.8.0,
|
||||
any.profunctors ==5.5.2,
|
||||
any.quickcheck-io ==0.2.0,
|
||||
any.random ==1.1,
|
||||
any.ref-tf ==0.4.0.2,
|
||||
any.reflection ==2.1.6,
|
||||
reflection -slow +template-haskell,
|
||||
any.regex-base ==0.94.0.0,
|
||||
any.regex-tdfa ==1.3.1.0,
|
||||
regex-tdfa -force-o2,
|
||||
any.resourcet ==1.2.4,
|
||||
any.rts ==1.0,
|
||||
any.s-cargot ==0.1.4.0,
|
||||
s-cargot -build-example,
|
||||
any.s-cargot-letbind ==0.2.3.0,
|
||||
any.scheduler ==1.4.2.2,
|
||||
any.scientific ==0.3.6.2,
|
||||
scientific -bytestring-builder -integer-simple,
|
||||
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.smallcheck ==1.1.5,
|
||||
any.split ==0.2.3.4,
|
||||
any.splitmix ==0.0.4,
|
||||
splitmix -optimised-mixer +random,
|
||||
any.sqlite-simple ==0.4.18.0,
|
||||
any.stm ==2.5.0.0,
|
||||
any.syb ==0.7.1,
|
||||
any.tagged ==0.8.6,
|
||||
tagged +deepseq +transformers,
|
||||
any.tasty ==1.3.1,
|
||||
tasty +clock,
|
||||
any.tasty-expected-failure ==0.11.1.2,
|
||||
any.tasty-golden ==2.3.3.3,
|
||||
tasty-golden -build-example,
|
||||
any.tasty-hedgehog ==1.0.0.2,
|
||||
any.tasty-hspec ==1.1.5.1,
|
||||
any.tasty-hunit ==0.10.0.2,
|
||||
any.tasty-quickcheck ==0.10.1.1,
|
||||
any.tasty-smallcheck ==0.8.1,
|
||||
any.template-haskell ==2.15.0.0,
|
||||
any.temporary ==1.3,
|
||||
any.terminal-size ==0.3.2.1,
|
||||
any.terminfo ==0.4.1.4,
|
||||
any.text ==1.2.4.0,
|
||||
any.tf-random ==0.5,
|
||||
any.th-abstraction ==0.3.2.0,
|
||||
any.th-lift ==0.8.1,
|
||||
any.time ==1.9.3,
|
||||
any.transformers ==0.5.6.2,
|
||||
any.transformers-base ==0.4.5.2,
|
||||
transformers-base +orphaninstances,
|
||||
any.transformers-compat ==0.6.5,
|
||||
transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
|
||||
any.type-equality ==1,
|
||||
any.unbounded-delays ==0.1.1.0,
|
||||
any.uniplate ==1.6.12,
|
||||
uniplate +separate_syb +typeable_fingerprint,
|
||||
any.unix ==2.7.2.2,
|
||||
any.unix-compat ==0.5.2,
|
||||
unix-compat -old-time,
|
||||
any.unliftio ==0.2.13,
|
||||
any.unliftio-core ==0.2.0.1,
|
||||
any.unordered-containers ==0.2.10.0,
|
||||
unordered-containers -debug,
|
||||
any.utf8-string ==1.0.1.1,
|
||||
any.vector ==0.12.1.2,
|
||||
vector +boundschecks -internalchecks -unsafechecks -wall,
|
||||
any.vector-sized ==1.4.1.0,
|
||||
any.versions ==3.5.4,
|
||||
any.void ==0.7.3,
|
||||
void -safe,
|
||||
any.wcwidth ==0.0.2,
|
||||
wcwidth -cli +split-base,
|
||||
any.wl-pprint-annotated ==0.1.0.1,
|
||||
any.xml ==1.3.14,
|
||||
any.zenc ==0.1.1,
|
||||
any.zlib ==0.6.2.1,
|
||||
zlib -non-blocking-ffi -pkg-config,
|
||||
any.zlib-bindings ==0.1.1.5
|
||||
2
deps/asl-translator
vendored
2
deps/asl-translator
vendored
@ -1 +1 @@
|
||||
Subproject commit a654f18d0253e82c960deabe7eb2950b35889abe
|
||||
Subproject commit 0c0f7ac37d4a72f59ac08b8281a23997b8f685b0
|
||||
2
deps/crucible
vendored
2
deps/crucible
vendored
@ -1 +1 @@
|
||||
Subproject commit 5c46b3ae77ddb2e95d2005f8cca675163a55fa1b
|
||||
Subproject commit aca70a9b30a823579883e5b9ea1f81391b3e59fb
|
||||
2
deps/dismantle
vendored
2
deps/dismantle
vendored
@ -1 +1 @@
|
||||
Subproject commit 34ed1a425c691a71de62afce5794db52c9486a6d
|
||||
Subproject commit 6c66dfaa131255383bd4cade0556beda00d57e90
|
||||
2
deps/parameterized-utils
vendored
2
deps/parameterized-utils
vendored
@ -1 +1 @@
|
||||
Subproject commit 43cb6d28259265a59075f50b87381032d2e96419
|
||||
Subproject commit 4204eeb152fc21011aa6a88cd1aab9d994c32ebd
|
||||
2
deps/semmc
vendored
2
deps/semmc
vendored
@ -1 +1 @@
|
||||
Subproject commit dc1e4b5786fda4fb61140d83aa8951cd425201fc
|
||||
Subproject commit 67d66fbebd91db5aa773a0c4ff8e61be2382445c
|
||||
2
deps/what4
vendored
2
deps/what4
vendored
@ -1 +1 @@
|
||||
Subproject commit 911e0cd4e6addc0e16d0525b23519ee3c4f9cb50
|
||||
Subproject commit 3a12e48f9e066ce99d7c29c16f067235abbfec31
|
||||
2
deps/what4-serialize
vendored
2
deps/what4-serialize
vendored
@ -1 +1 @@
|
||||
Subproject commit ab27026bd7bde4a41e5cceaefe4258d017c23800
|
||||
Subproject commit f6177603aff8f3fa663aece2f0b35046e9c4202d
|
||||
@ -66,7 +66,7 @@ library
|
||||
, what4 >= 0.4.0
|
||||
, scheduler >= 1.4 && < 1.5
|
||||
, async
|
||||
, lumberjack >= 0.1 && < 0.2
|
||||
, lumberjack >= 0.1.0.2 && < 0.2
|
||||
, unliftio-core >= 0.2 && < 0.3
|
||||
, exceptions >= 0.10 && < 0.11
|
||||
, haggle
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
#flags:
|
||||
# time-locale-compat:
|
||||
# old-locale: false
|
||||
|
||||
resolver: lts-12.26
|
||||
|
||||
packages:
|
||||
- base
|
||||
- symbolic
|
||||
# X86 specific repos
|
||||
- x86
|
||||
- x86/support
|
||||
- x86_symbolic
|
||||
extra-deps:
|
||||
- base-orphans-0.8.2@sha256:40ef37ed043aac2cbb6c538fdebfc62e601ee65ee161e4a6327452133b574d7e,2958
|
||||
- boomerang-1.4.5.6@sha256:4f8407b9482a500ef9f8dc3fa13f9615d4d33a7c530b67c1ca27535e136a152d
|
||||
- itanium-abi-0.1.1.1@sha256:1d727fa88ecafc13ba4ec2b6a752182ce70333fbde9726aec1393151d14de6df
|
||||
- monadLib-3.9@sha256:7225fb80bf183bf64968b7d251236fb203b86838679de3eddee7bcc59925adef
|
||||
- panic-0.4.0.1@sha256:fb46577c9e0ca38c37960572f958a8469f2b577e963ed4f3ea1904d8400d828b
|
||||
- th-abstraction-0.3.1.0@sha256:96042f6658f2dccfac03b33f0fd59f62b1f65b9b0a765d8a2ea6026f4081ee4a
|
||||
- bifunctors-5.5.4
|
||||
- deriving-compat-0.5.6
|
||||
- invariant-0.5.3
|
||||
- lens-4.17.1
|
||||
- microlens-th-0.4.2.3
|
||||
- zenc-0.1.1@sha256:e4be3e5e9fe1a1ade05910909c6e5b5a8eff72e697868b03955c9781b0443947,964
|
||||
|
||||
# Submodules added to extra-deps so that we do not fail on warnings.
|
||||
- ./deps/what4/what4
|
||||
- ./deps/crucible/crucible
|
||||
- ./deps/crucible/crucible-llvm
|
||||
- ./deps/dwarf
|
||||
- ./deps/elf-edit
|
||||
- ./deps/flexdis86
|
||||
- ./deps/flexdis86/binary-symbols
|
||||
- ./deps/llvm-pretty
|
||||
- ./deps/llvm-pretty-bc-parser
|
||||
- ./deps/parameterized-utils
|
||||
@ -1,26 +0,0 @@
|
||||
resolver: lts-14.23
|
||||
|
||||
packages:
|
||||
- base
|
||||
- symbolic
|
||||
# X86 specific repos
|
||||
- x86
|
||||
- x86/support
|
||||
- x86_symbolic
|
||||
extra-deps:
|
||||
- boomerang-1.4.5.7@sha256:67358e1ed44db2da2bf5ba8b5ccde4e3cd19adbc286c5308dba448f89fb03c4a,1979
|
||||
- itanium-abi-0.1.1.1@sha256:1d727fa88ecafc13ba4ec2b6a752182ce70333fbde9726aec1393151d14de6df,1520
|
||||
- monadLib-3.10@sha256:21dc120625bd612527b372e54251fd8358270effe263023d40d8e5892d24531c,653
|
||||
- panic-0.4.0.1@sha256:fb46577c9e0ca38c37960572f958a8469f2b577e963ed4f3ea1904d8400d828b,702
|
||||
- zenc-0.1.1@sha256:e4be3e5e9fe1a1ade05910909c6e5b5a8eff72e697868b03955c9781b0443947,964
|
||||
# Submodules added to extra-deps so that we do not fail on warnings.
|
||||
- ./deps/what4/what4
|
||||
- ./deps/crucible/crucible
|
||||
- ./deps/crucible/crucible-llvm
|
||||
- ./deps/llvm-pretty
|
||||
- ./deps/llvm-pretty-bc-parser
|
||||
- ./deps/parameterized-utils
|
||||
- ./deps/dwarf
|
||||
- ./deps/elf-edit
|
||||
- ./deps/flexdis86
|
||||
- ./deps/flexdis86/binary-symbols
|
||||
Loading…
Reference in New Issue
Block a user