diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2017-12-19 22:28:25 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2017-12-19 22:28:25 -0800 |
| commit | ac202e648b1c72e55737dc1e71ed94937ad5e835 (patch) | |
| tree | 1489c6aef4f3fc22c67a3d582dcb82592f83f606 | |
| parent | 1e21cfb251506d42cbdcf3e24661f08633817572 (diff) | |
Stack builds with lts-10.0.
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | stack.pkg.yaml | 17 | ||||
| -rw-r--r-- | stack.yaml | 15 |
3 files changed, 8 insertions, 32 deletions
diff --git a/.travis.yml b/.travis.yml index 75366b9c0..6364ecf88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,12 +61,12 @@ matrix: # The Stack builds. We can pass in arbitrary Stack arguments via the ARGS # variable, such as using --stack-yaml to point to a different file. - - env: BUILD=stack ARGS="--resolver lts-9" OPTS="-Wall -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -fno-warn-unused-do-bind -Werror" - compiler: ": #stack 8.0.2" - addons: {apt: {packages: [ghc-8.0.2], sources: [hvr-ghc]}} + - env: BUILD=stack ARGS="--resolver lts-10" OPTS="-Wall -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -fno-warn-unused-do-bind -Werror" + compiler: ": #stack 8.2.2" + addons: {apt: {packages: [ghc-8.2.2], sources: [hvr-ghc]}} # Nightly builds are allowed to fail - - env: BUILD=stack ARGS="--resolver nightly" + - env: BUILD=stack ARGS="--resolver nightly" OPTS="-Wall -Wincomplete-record-updates -Wnoncanonical-monad-instances -Wnoncanonical-monadfail-instances -fno-warn-unused-do-bind -Werror" compiler: ": #stack nightly" addons: {apt: {packages: [ghc-8.2.2], sources: [hvr-ghc]}} diff --git a/stack.pkg.yaml b/stack.pkg.yaml index fc59a9566..fe6f0622c 100644 --- a/stack.pkg.yaml +++ b/stack.pkg.yaml @@ -12,18 +12,5 @@ flags: debug: false packages: - '.' -extra-deps: -- pandoc-types-1.17.3 -- hslua-0.9.3 -- hslua-module-text-0.1.2 -- skylighting-0.5 -- texmath-0.10 -- cmark-gfm-0.1.1 -- QuickCheck-2.10.0.1 -- tasty-quickcheck-0.9.1 -- hs-bibutils-6.2.0.1 -- doctemplates-0.2.1 -- pandoc-citeproc-0.12.1.1 -- haddock-library-1.4.3 -- tagsoup-0.14.2 -resolver: lts-9.14 +extra-deps: [] +resolver: lts-10.0 diff --git a/stack.yaml b/stack.yaml index 6cd42b23b..c8e1990d7 100644 --- a/stack.yaml +++ b/stack.yaml @@ -5,16 +5,5 @@ flags: old-locale: false network-uri: true packages: -extra-deps: -- pandoc-types-1.17.3 -- hslua-0.9.3 -- hslua-module-text-0.1.2 -- skylighting-0.5 -- texmath-0.10 -- cmark-gfm-0.1.1 -- QuickCheck-2.10.0.1 -- tasty-quickcheck-0.9.1 -- doctemplates-0.2.1 -- haddock-library-1.4.3 -- tagsoup-0.14.2 -resolver: lts-9.14 +extra-deps: [] +resolver: lts-10.0 |