Revert "Always use solver on Travis"

This reverts commit 5b18bf0c09.
This commit is contained in:
Michael Snoyman 2017-07-23 16:45:47 +03:00
parent 5b18bf0c09
commit ada76a9636
No known key found for this signature in database
GPG Key ID: A048E8C057E86876
2 changed files with 6 additions and 3 deletions

View File

@ -139,8 +139,11 @@ install:
- if [ -f configure.ac ]; then autoreconf -i; fi - if [ -f configure.ac ]; then autoreconf -i; fi
- | - |
set -ex set -ex
stack --install-ghc $ARGS build cabal-install if [ "$ARGS" = "--resolver nightly" ]
stack --install-ghc $ARGS solver --update-config then
stack --install-ghc $ARGS build cabal-install
stack --install-ghc $ARGS solver --update-config
fi
set +ex set +ex
script: script:

View File

@ -24,7 +24,7 @@ library
, yesod-persistent >= 1.4 && < 1.5 , yesod-persistent >= 1.4 && < 1.5
, time >= 1.1.4 , time >= 1.1.4
, shakespeare >= 2.0 , shakespeare >= 2.0
, persistent >= 2.5 , persistent
, template-haskell , template-haskell
, transformers >= 0.2.2 , transformers >= 0.2.2
, data-default , data-default