Merge branch 'master' of github.com:bitemyapp/bloodhound

steshaw · Sep 14, 2015 · 7b0c801 · 7b0c801
2 parents f28180c + b169376
commit 7b0c801
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/bloodhound.cabal b/bloodhound.cabal
@@ -39,7 +39,8 @@ library
                        exceptions,
                        data-default-class,
                        blaze-builder,
-                       unordered-containers
+                       unordered-containers,
+                       mtl-compat
   default-language:    Haskell2010
 
 test-suite tests

diff --git a/src/Database/Bloodhound/Client.hs b/src/Database/Bloodhound/Client.hs
@@ -202,7 +202,8 @@ bindM2 f ma mb = join (f <$> ma <*> mb)
 -- settings in IO. If you've got your own monad transformer stack, you
 -- should use 'runBH' directly.
 withBH :: ManagerSettings -> Server -> BH IO a -> IO a
-withBH ms s f = withManager ms $ \mgr -> do
+withBH ms s f = do
+  mgr <- newManager ms
   let env = BHEnv { bhServer  = s
                   , bhManager = mgr }
   runBH env f

diff --git a/src/Database/Bloodhound/Types.hs b/src/Database/Bloodhound/Types.hs
@@ -231,7 +231,7 @@ module Database.Bloodhound.Types
 
 import           Control.Applicative
 import           Control.Monad.Catch
-import           Control.Monad.Error
+import           Control.Monad.Except
 import           Control.Monad.Reader
 import           Control.Monad.State
 import           Control.Monad.Writer

diff --git a/src/Database/Bloodhound/Types/Class.hs b/src/Database/Bloodhound/Types/Class.hs
@@ -1,8 +1,11 @@
+{-# LANGUAGE CPP #-}
 module Database.Bloodhound.Types.Class
        ( Seminearring(..) )
        where
 
+#if !MIN_VERSION_base(4,8,0)
 import Data.Monoid
+#endif
 
 class Monoid a => Seminearring a where
   -- 0, +, *