From dc1e8a9be49670c75a99bb57a40e0cc1e29c89af Mon Sep 17 00:00:00 2001
From: Simon Jakobi <simon.jakobi@gmail.com>
Date: Wed, 31 Aug 2016 18:49:51 +0200
Subject: [PATCH 1/4] .travis.yml: Add diagnostic output on stack location and
 version

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

diff --git a/.travis.yml b/.travis.yml
index 14f700aa42..13a9c48512 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,6 +57,8 @@ before_install:
 
 install:
  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
+ - echo "stack location: $(which stack)"
+ - stack --version
  - case "$BUILD" in
      stack)
        stack --no-terminal test --only-dependencies;;

From 56311984724e2ddce0869cae7c37db77848b106e Mon Sep 17 00:00:00 2001
From: Simon Jakobi <simon.jakobi@gmail.com>
Date: Wed, 31 Aug 2016 19:01:32 +0200
Subject: [PATCH 2/4] .travis.yml: Fix accidental YAML syntax

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 13a9c48512..0871385ef8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,7 @@ before_install:
 
 install:
  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
- - echo "stack location: $(which stack)"
+ - echo "stack is located at $(which stack)"
  - stack --version
  - case "$BUILD" in
      stack)

From 6b1f11847b0d6cae182b4c61008786988084d309 Mon Sep 17 00:00:00 2001
From: Simon Jakobi <simon.jakobi@gmail.com>
Date: Wed, 31 Aug 2016 19:23:05 +0200
Subject: [PATCH 3/4] .travis.yml: Clear ~/.cabal/bin to make sure that
 released stack version is used

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

diff --git a/.travis.yml b/.travis.yml
index 0871385ef8..1d20b8ae18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,14 +57,15 @@ before_install:
 
 install:
  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
- - echo "stack is located at $(which stack)"
- - stack --version
  - case "$BUILD" in
      stack)
        stack --no-terminal test --only-dependencies;;
      cabal)
        cabal --version;
        travis_retry cabal update;
+       rm -rf $HOME/.cabal/bin;
+       echo "stack is located at $(which stack)";
+       stack --version;
        rm -f $(stack --compiler=ghc-$GHCVER path --dist-dir)/stack-*.tar.gz &&
        stack --compiler=ghc-$GHCVER sdist --pvp-bounds=both &&
        tar xf $(stack --compiler=ghc-$GHCVER path --dist-dir)/stack-*.tar.gz --wildcards --strip-components=1 '*/stack.cabal' &&

From 54499cde80bd75194485e75dfeb4040af8219600 Mon Sep 17 00:00:00 2001
From: Simon Jakobi <simon.jakobi@gmail.com>
Date: Thu, 1 Sep 2016 00:55:09 +0200
Subject: [PATCH 4/4] Remove ~/.cabal/bin/stack but keep e.g.
 ~/.cabal/bin/hspec-discover

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1d20b8ae18..83cf3529e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,7 +63,7 @@ install:
      cabal)
        cabal --version;
        travis_retry cabal update;
-       rm -rf $HOME/.cabal/bin;
+       rm -f $HOME/.cabal/bin/stack;
        echo "stack is located at $(which stack)";
        stack --version;
        rm -f $(stack --compiler=ghc-$GHCVER path --dist-dir)/stack-*.tar.gz &&