git.iko.soy/typeable/bloodhound
on master help sign in
Manually cherry pick from https://github.com/bitemyapp/bloodhound/commit/c5603ff4e120b7b23960373541d8ecfe142f09f3
commit4fa060a90ef771602debd2826a10ea17e1fe93bc authorGiorgio Marinelli <giorgio@marinel.li> dateMon 12 Aug 2019, 22:04 (7 years ago) parent9537ed2
5 files changed+27−3
compare with master
unifiedsplit
bloodhound.cabal+1−1 src/Database/V5/Bloodhound/Internal/Analysis.hs−1 src/Database/V5/Bloodhound/Internal/Client.hs+11 stack-8.6.yaml+14 stack.yaml+1−1
bloodhound.cabal+1−1
@@ -66,7 +66,7 @@ library
6666 aeson >= 0.11.1,
6767 blaze-builder,
6868 bytestring >= 0.10.0 && <0.11,
69− containers >= 0.5.0.0 && <0.6,
69+ containers >= 0.5.0.0 && <0.7,
7070 exceptions,
7171 hashable,
7272 http-client >= 0.4.30 && <0.7,
src/Database/V5/Bloodhound/Internal/Analysis.hs−1
@@ -6,7 +6,6 @@ module Database.V5.Bloodhound.Internal.Analysis where
66import Bloodhound.Import
77
88import qualified Data.Map.Strict as M
9−import Data.String
109import qualified Data.Text as T
1110
1211import Database.V5.Bloodhound.Internal.Newtypes
src/Database/V5/Bloodhound/Internal/Client.hs+11
@@ -1,3 +1,4 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE FlexibleInstances #-}
23{-# LANGUAGE GeneralizedNewtypeDeriving #-}
34{-# LANGUAGE MultiParamTypeClasses #-}
@@ -9,6 +10,11 @@ module Database.V5.Bloodhound.Internal.Client where
910
1011import Bloodhound.Import
1112
13+#if defined(MIN_VERSION_GLASGOW_HASKELL)
14+#if MIN_VERSION_GLASGOW_HASKELL(8,6,0,0)
15+import Control.Monad.Fail (MonadFail)
16+#endif
17+#endif
1218import qualified Data.Text as T
1319import qualified Data.Traversable as DT
1420import qualified Data.HashMap.Strict as HM
@@ -71,6 +77,11 @@ newtype BH m a = BH {
7177 , MonadFix
7278 , MonadThrow
7379 , MonadCatch
80+#if defined(MIN_VERSION_GLASGOW_HASKELL)
81+#if MIN_VERSION_GLASGOW_HASKELL(8,6,0,0)
82+ , MonadFail
83+#endif
84+#endif
7485 , MonadMask)
7586
7687instance MonadTrans BH where
stack-8.6.yamlnew file+14
@@ -0,0 +1,14 @@
1+flags:
2+ bloodhound-examples:
3+ werror: true
4+
5+packages:
6+ - '.'
7+ - './examples'
8+
9+extra-deps:
10+ - git: https://github.com/bitemyapp/quickcheck-arbitrary-template.git
11+ commit: bf9cee96a88ecce2ff920ce74c166a38712e5ed2
12+ - quickcheck-properties-0.1
13+
14+resolver: lts-13.21
stack.yaml+1−1
@@ -1 +1 @@
1−stack-8.2.yaml
1+stack-8.6.yaml