@@ -69,15 +69,15 @@ matrix:
69
69
sources :
70
70
- hvr-ghc
71
71
72
- - env : TEST=STACKAGE GHC_VER=8.0.2 BUILD=STACK ARGS="--stack-yaml stack-8.0.2.yaml --system-ghc" MANUAL_INSTALL_BUILD_TOOLS=NO
72
+ - env : TEST=STACKAGE GHC_VER=8.0.2 BUILD=STACK ARGS="--stack-yaml stack-8.0.2.yaml --system-ghc"
73
73
addons :
74
74
apt :
75
75
packages :
76
76
- ghc-8.0.2
77
77
sources :
78
78
- hvr-ghc
79
79
80
- - env : TEST=STACKAGE GHC_VER=7.10.3 BUILD=STACK ARGS="--stack-yaml stack-7.10.3.yaml --system-ghc" MANUAL_INSTALL_BUILD_TOOLS=YES
80
+ - env : TEST=STACKAGE GHC_VER=7.10.3 BUILD=STACK ARGS="--stack-yaml stack-7.10.3.yaml --system-ghc"
81
81
addons :
82
82
apt :
83
83
packages :
@@ -180,13 +180,6 @@ install:
180
180
181
181
# TODO (2016-02-21): Split the long lines (`\` doesn't work).
182
182
183
- # We have to manually install `alex`, `cpphs` and possibly `happy`
184
- # for older snapshots because `stack` seems to have trouble installing
185
- # build tools for those snapshots. Note that the version of `cpphs`
186
- # is currently specified in the yaml files.
187
- #
188
- # See https://github.com/commercialhaskell/stack/issues/595.
189
-
190
183
# N.B. that we use the `--force-reinstalls` option [Issue 1520].
191
184
192
185
# We are using `make CABAL_OPTS...` because we are including the
@@ -195,10 +188,7 @@ install:
195
188
travis_retry cabal fetch `cabal install --dependencies-only --force-reinstalls --dry-run | sed 1,2d | sed "s|(latest[^)]*)||g"` &&
196
189
make CABAL_OPTS='--only-dependencies --force-reinstalls' install-bin;
197
190
elif [[ $TEST = "STACKAGE" ]]; then
198
- if [[ $MANUAL_INSTALL_BUILD_TOOLS = "YES" ]]; then
199
- stack install $ARGS --no-terminal alex cpphs happy;
200
- fi;
201
- stack build $ARGS --no-terminal --only-dependencies;
191
+ stack build $ARGS --no-terminal --only-dependencies;
202
192
fi
203
193
204
194
# #############################################################################
0 commit comments