typeable/bloodhound
1
0
Fork 0
mirror of https://github.com/typeable/bloodhound.git synced 2024-11-22 17:43:22 +03:00
Code Issues Projects Releases Wiki Activity

Manually cherry pick from c5603ff4e1

Browse Source
This commit is contained in:
Giorgio Marinelli 2019-08-12 22:04:14 +02:00
parent 9537ed2539
commit 4fa060a90e
5 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bloodhound.cabal
View File

@ -66,7 +66,7 @@ library
aeson >= 0.11.1,
blaze-builder,
bytestring >= 0.10.0 && <0.11,
containers >= 0.5.0.0 && <0.6,
containers >= 0.5.0.0 && <0.7,
exceptions,
hashable,
http-client >= 0.4.30 && <0.7,

1
src/Database/V5/Bloodhound/Internal/Analysis.hs
View File

@ -6,7 +6,6 @@ module Database.V5.Bloodhound.Internal.Analysis where
import Bloodhound.Import
import qualified Data.Map.Strict as M
import Data.String
import qualified Data.Text as T
import Database.V5.Bloodhound.Internal.Newtypes

11
src/Database/V5/Bloodhound/Internal/Client.hs
View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE MultiParamTypeClasses #-}
@ -9,6 +10,11 @@ module Database.V5.Bloodhound.Internal.Client where
import Bloodhound.Import
#if defined(MIN_VERSION_GLASGOW_HASKELL)
#if MIN_VERSION_GLASGOW_HASKELL(8,6,0,0)
import Control.Monad.Fail (MonadFail)
#endif
#endif
import qualified Data.Text as T
import qualified Data.Traversable as DT
import qualified Data.HashMap.Strict as HM
@ -71,6 +77,11 @@ newtype BH m a = BH {
, MonadFix
, MonadThrow
, MonadCatch
#if defined(MIN_VERSION_GLASGOW_HASKELL)
#if MIN_VERSION_GLASGOW_HASKELL(8,6,0,0)
, MonadFail
#endif
#endif
, MonadMask)
instance MonadTrans BH where

14
stack-8.6.yaml Normal file
View File

@ -0,0 +1,14 @@
flags:
bloodhound-examples:
werror: true
packages:
- '.'
- './examples'
extra-deps:
- git: https://github.com/bitemyapp/quickcheck-arbitrary-template.git
commit: bf9cee96a88ecce2ff920ce74c166a38712e5ed2
- quickcheck-properties-0.1
resolver: lts-13.21

2
stack.yaml
View File

@ -1 +1 @@
stack-8.2.yaml
stack-8.6.yaml