From 5b18bf0c09077019b67b4d6052fb3bccb16ddc7d Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 23 Jul 2017 16:28:58 +0300
Subject: [PATCH] Always use solver on Travis

---
 .travis.yml                 | 7 ++-----
 yesod-form/yesod-form.cabal | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ab790d0b..ee5e3d0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -139,11 +139,8 @@ install:
 - if [ -f configure.ac ]; then autoreconf -i; fi
 - |
   set -ex
-  if [ "$ARGS" = "--resolver nightly" ]
-  then
-    stack --install-ghc $ARGS build cabal-install
-    stack --install-ghc $ARGS solver --update-config
-  fi
+  stack --install-ghc $ARGS build cabal-install
+  stack --install-ghc $ARGS solver --update-config
   set +ex
 
 script:
diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal
index 177653d9..7c8d05a1 100644
--- 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
+                   , persistent            >= 2.5
                    , template-haskell
                    , transformers          >= 0.2.2
                    , data-default