Merge branch 'master' of github.com:bitemyapp/bloodhound
commit7b0c8012e1fec6ef019585c5de9a86b25bb3f7f5
authorChris Allen <cma@bitemyapp.com>
dateMon 14 Sep 2015, 00:50 (11 years ago)
parentf28180cb169376
bloodhound.cabal+2−1
@@ -39,7 +39,8 @@ library
3939 exceptions,
4040 data-default-class,
4141 blaze-builder,
42− unordered-containers
42+ unordered-containers,
43+ mtl-compat
4344 default-language: Haskell2010
4445
4546test-suite tests
src/Database/Bloodhound/Client.hs+2−1
@@ -202,7 +202,8 @@ bindM2 f ma mb = join (f <$> ma <*> mb)
202202-- settings in IO. If you've got your own monad transformer stack, you
203203-- should use 'runBH' directly.
204204withBH :: ManagerSettings -> Server -> BH IO a -> IO a
205−withBH ms s f = withManager ms $ \mgr -> do
205+withBH ms s f = do
206+ mgr <- newManager ms
206207 let env = BHEnv { bhServer = s
207208 , bhManager = mgr }
208209 runBH env f
src/Database/Bloodhound/Types.hs+1−1
@@ -231,7 +231,7 @@ module Database.Bloodhound.Types
231231
232232import Control.Applicative
233233import Control.Monad.Catch
234−import Control.Monad.Error
234+import Control.Monad.Except
235235import Control.Monad.Reader
236236import Control.Monad.State
237237import Control.Monad.Writer
src/Database/Bloodhound/Types/Class.hs+3
@@ -1,8 +1,11 @@
1+{-# LANGUAGE CPP #-}
12module Database.Bloodhound.Types.Class
23 ( Seminearring(..) )
34 where
45
6+#if !MIN_VERSION_base(4,8,0)
57import Data.Monoid
8+#endif
69
710class Monoid a => Seminearring a where
811 -- 0, +, *