From 6bf1ba3a7a3fdf92fa4af2ccb148ee2004dd607a Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 9 Jun 2015 06:23:26 +0300
Subject: [PATCH] GHC 7.10 fixes

---
 src/Control/Monad/Logger/Sticky.hs | 2 ++
 src/test/Stack/BuildPlanSpec.hs    | 1 +
 src/test/Stack/ConfigSpec.hs       | 5 +++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Control/Monad/Logger/Sticky.hs b/src/Control/Monad/Logger/Sticky.hs
index 374ea26aeb..10eec7165f 100644
--- a/src/Control/Monad/Logger/Sticky.hs
+++ b/src/Control/Monad/Logger/Sticky.hs
@@ -25,6 +25,8 @@ import           Language.Haskell.TH
 import           System.IO
 import           System.Log.FastLogger
 
+import           Prelude -- avoid AMP warnings
+
 data State = State
     { stateCurrentLine :: !(Maybe ByteString)
     , stateMaxColumns :: !Int
diff --git a/src/test/Stack/BuildPlanSpec.hs b/src/test/Stack/BuildPlanSpec.hs
index 6cc7836479..b8c5fc8e16 100644
--- a/src/test/Stack/BuildPlanSpec.hs
+++ b/src/test/Stack/BuildPlanSpec.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TemplateHaskell #-}
diff --git a/src/test/Stack/ConfigSpec.hs b/src/test/Stack/ConfigSpec.hs
index 0d6ed922b0..af7076161f 100644
--- a/src/test/Stack/ConfigSpec.hs
+++ b/src/test/Stack/ConfigSpec.hs
@@ -1,5 +1,6 @@
-{-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE RecordWildCards  #-}
+{-# LANGUAGE TemplateHaskell  #-}
 module Stack.ConfigSpec where
 
 import Control.Applicative