From 4be2d6574df2d2d897595a685ffc9333e4db2222 Mon Sep 17 00:00:00 2001
From: Harry Garrood <harry@garrood.me>
Date: Mon, 20 Nov 2017 16:33:32 +0000
Subject: [PATCH 1/2] Update Glob library, fixes #3055

Also update the Stackage snapshot so that we get the latest version of
Glob, which includes memory usage and performance fixes.
---
 package.yaml | 2 +-
 stack.yaml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.yaml b/package.yaml
index 52b66f0da1..c89f0f75b4 100644
--- a/package.yaml
+++ b/package.yaml
@@ -52,7 +52,7 @@ dependencies:
   - file-embed
   - filepath
   - fsnotify >=0.2.1
-  - Glob >=0.7 && <0.9
+  - Glob >=0.9 && <0.10
   - haskeline >=0.7.0.0
   - http-client >=0.4.30 && <0.6.0
   - http-types
diff --git a/stack.yaml b/stack.yaml
index df22368d47..4336168e7a 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2017-09-10
+resolver: nightly-2017-11-20
 packages:
 - '.'
 extra-deps:

From fb5d88ef73cc94ca405fce53a1c9c66f86415f33 Mon Sep 17 00:00:00 2001
From: Harry Garrood <harry@garrood.me>
Date: Mon, 20 Nov 2017 21:51:12 +0000
Subject: [PATCH 2/2] Reduce timeout threshold to help avoid CI failures

---
 travis/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/travis/build.sh b/travis/build.sh
index 679612883b..5005a5f9ed 100755
--- a/travis/build.sh
+++ b/travis/build.sh
@@ -5,7 +5,7 @@ STACK="stack --no-terminal --jobs=1"
 
 # Setup & install dependencies or abort
 ret=0
-$TIMEOUT 40m $STACK --install-ghc build \
+$TIMEOUT 30m $STACK --install-ghc build \
   --only-dependencies --test --haddock \
   || ret=$?
 case "$ret" in