aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2016-07-14 08:46:56 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2016-07-14 08:46:56 -0700
commit3d86228c5b5c1d2d013a267e269fa9bdbc519e33 (patch)
tree53ace6705f2533b62dcfb508b32b36d745b66ada
parent06a3e6a03f8cdef118bea59c45230b80b9534b19 (diff)
downloadpandoc-3d86228c5b5c1d2d013a267e269fa9bdbc519e33.tar.gz
Fixed lts6 travis build.
-rw-r--r--.travis.yml4
-rw-r--r--stack.lts6.yaml13
2 files changed, 15 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 62c9acc89..30395b8b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,7 @@ 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-6"
+ - env: BUILD=stack ARGS="--resolver lts-6 --stack-yaml stack.lts6.yaml"
compiler: ": #stack 7.10.3"
addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
@@ -59,7 +59,7 @@ matrix:
compiler: ": #stack nightly"
addons: {apt: {packages: [libgmp-dev]}}
- - env: BUILD=stack ARGS="--resolver lts-6"
+ - env: BUILD=stack ARGS="--resolver lts-6 --stack-yaml stack.lts6.yaml"
compiler: ": #stack 7.10.3 osx"
os: osx
diff --git a/stack.lts6.yaml b/stack.lts6.yaml
new file mode 100644
index 000000000..4208be350
--- /dev/null
+++ b/stack.lts6.yaml
@@ -0,0 +1,13 @@
+flags:
+ pandoc:
+ trypandoc: false
+ https: true
+ embed_data_files: false
+ old-locale: false
+ network-uri: true
+packages:
+- '.'
+extra-deps:
+- data-default-0.6.0
+- http-client-0.5.0
+- http-client-tls-0.3.0