From ffc1e6918cbd838c672103a7239c54a596e159c2 Mon Sep 17 00:00:00 2001
From: Tej Chajed <tchajed@mit.edu>
Date: Fri, 31 May 2019 17:00:38 -0400
Subject: [PATCH] Add stack configuration for GHC 8.6
---
.travis.yml | 3 +++
brittany.cabal | 12 ++++++------
stack-8.6.5.yaml | 5 +++++
3 files changed, 14 insertions(+), 6 deletions(-)
create mode 100644 stack-8.6.5.yaml
diff --git a/.travis.yml b/.travis.yml
index 195c1a2..d1b303b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,6 +95,9 @@ matrix:
- env: BUILD=stack ARGS="--stack-yaml stack-8.2.2.yaml"
compiler: ": #stack 8.2.2"
addons: {apt: {packages: [libgmp-dev]}}
+ - env: BUILD=stack ARGS="--stack-yaml stack-8.6.5.yaml"
+ compiler: ": #stack 8.6.5"
+ addons: {apt: {packages: [libgmp-dev]}}
# Nightly builds are allowed to fail
- env: BUILD=stack ARGS="--resolver nightly"
diff --git a/brittany.cabal b/brittany.cabal
index c1a31eb..5a16f50 100644
--- a/brittany.cabal
+++ b/brittany.cabal
@@ -86,7 +86,7 @@ library {
{ base >=4.9 && <4.13
, ghc >=8.0.1 && <8.7
, ghc-paths >=0.1.0.9 && <0.2
- , ghc-exactprint >=0.5.8 && <0.5.9
+ , ghc-exactprint >=0.5.8 && <0.7
, transformers >=0.5.2.0 && <0.6
, containers >=0.5.7.1 && <0.7
, mtl >=2.2.1 && <2.3
@@ -99,12 +99,12 @@ library {
, bytestring >=0.10.8.1 && <0.11
, directory >=1.2.6.2 && <1.4
, butcher >=1.3.1 && <1.4
- , yaml >=0.8.18 && <0.9
+ , yaml >=0.8.18 && <0.12
, aeson >=1.0.1.0 && <1.5
, extra >=1.4.10 && <1.7
, uniplate >=1.6.12 && <1.7
, strict >=0.3.2 && <0.4
- , monad-memo >=0.4.1 && <0.5
+ , monad-memo >=0.4.1 && <0.6
, unsafe >=0.0 && <0.1
, safe >=0.3.9 && <0.4
, deepseq >=1.4.2.0 && <1.5
@@ -242,7 +242,7 @@ test-suite unittests
, cmdargs
, czipwith
, ghc-boot-th
- , hspec >=2.4.1 && <2.6
+ , hspec >=2.4.1 && <2.7
}
main-is: TestMain.hs
other-modules: TestUtils
@@ -314,7 +314,7 @@ test-suite littests
, cmdargs
, czipwith
, ghc-boot-th
- , hspec >=2.4.1 && <2.6
+ , hspec >=2.4.1 && <2.7
, filepath
, parsec >=3.1.11 && <3.2
}
@@ -358,7 +358,7 @@ test-suite libinterfacetests
, base
, text
, transformers
- , hspec >=2.4.1 && <2.6
+ , hspec >=2.4.1 && <2.7
}
main-is: Main.hs
other-modules:
diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
new file mode 100644
index 0000000..2717de3
--- /dev/null
+++ b/stack-8.6.5.yaml
@@ -0,0 +1,5 @@
+resolver: lts-13.23
+
+extra-deps:
+ - butcher-1.3.2.1
+ - multistate-0.8.0.1
--
2.30.2