From 9ee3c3707441963835be04d38b14831c6d9e4b29 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 7 Feb 2017 15:23:58 +0200
Subject: [PATCH 1/2] Allow latest nightly

---
 stack.yaml                              | 2 +-
 yesod-auth-oauth/yesod-auth-oauth.cabal | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stack.yaml b/stack.yaml
index 03dfba42..e89cf2a8 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -16,7 +16,7 @@ packages:
 
 # Needed for LTS 2
 extra-deps:
-- wai-app-static-3.1.4.1
+- wai-app-static-3.1.6.1
 - http-api-data-0.2
 - yaml-0.8.17
 - nonce-1.0.2
diff --git a/yesod-auth-oauth/yesod-auth-oauth.cabal b/yesod-auth-oauth/yesod-auth-oauth.cabal
index 791e7a30..c8bb47b9 100644
--- a/yesod-auth-oauth/yesod-auth-oauth.cabal
+++ b/yesod-auth-oauth/yesod-auth-oauth.cabal
@@ -21,7 +21,7 @@ library
         cpp-options:     -DGHC7
     else
         build-depends:   base                >= 4         && < 4.3
-    build-depends:   authenticate-oauth      >= 1.5       && < 1.6
+    build-depends:   authenticate-oauth      >= 1.5       && < 1.7
                    , bytestring              >= 0.9.1.4
                    , yesod-core              >= 1.4       && < 1.5
                    , yesod-auth              >= 1.4       && < 1.5

From a53d2cecf50db1c144e3933f74a4dbc2c759005a Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 7 Feb 2017 19:00:48 +0200
Subject: [PATCH 2/2] Try using cabal-head to work around haskell/cabal#4298

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aab881d9..961b30e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,9 +53,9 @@ matrix:
   - env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22 HAPPYVER=1.19.5 ALEXVER=3.1.7
     compiler: ": #GHC 7.10.3"
     addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
-  - env: BUILD=cabal GHCVER=8.0.1 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7
+  - env: BUILD=cabal GHCVER=8.0.1 CABALVER=head HAPPYVER=1.19.5 ALEXVER=3.1.7
     compiler: ": #GHC 8.0.1"
-    addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
+    addons: {apt: {packages: [cabal-install-head,ghc-8.0.1,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
 
   # Build with the newest GHC and cabal-install. This is an accepted failure,
   # see below.