Revert "Always use solver on Travis"

This reverts commit 5b18bf0c09.
2017-07-23 16:45:47 +03:00 · 2017-07-23 16:45:47 +03:00 · ada76a9636
commit ada76a9636
parent 5b18bf0c09
2 changed files with 6 additions and 3 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -139,8 +139,11 @@ install:
 - if [ -f configure.ac ]; then autoreconf -i; fi
 - |
  set -ex
-  stack --install-ghc $ARGS build cabal-install
-  stack --install-ghc $ARGS solver --update-config
+  if [ "$ARGS" = "--resolver nightly" ]
+  then
+    stack --install-ghc $ARGS build cabal-install
+    stack --install-ghc $ARGS solver --update-config
+  fi
  set +ex

 script:
--- a/yesod-form/yesod-form.cabal
+++ b/yesod-form/yesod-form.cabal
@ -24,7 +24,7 @@ library
                   , yesod-persistent      >= 1.4      && < 1.5
                   , time                  >= 1.1.4
                   , shakespeare           >= 2.0
-                   , persistent            >= 2.5
+                   , persistent
                   , template-haskell
                   , transformers          >= 0.2.2
                   , data-default