Skip to content

Commit 1807c72

Browse files
committed
Merge pull request #388 from bgamari/master
Compatibility with GHC 8.0
2 parents 15143cc + c6e5126 commit 1807c72

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

servant-server/servant-server.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ library
6666
, system-filepath >= 0.4 && < 0.5
6767
, filepath >= 1
6868
, text >= 1.2 && < 1.3
69-
, transformers >= 0.3 && < 0.5
69+
, transformers >= 0.3 && < 0.6
7070
, transformers-compat>= 0.4
7171
, wai >= 3.0 && < 3.3
7272
, wai-app-static >= 3.0 && < 3.2

servant/src/Servant/API/ContentTypes.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ class (AllMime list) => AllCTRender (list :: [*]) a where
169169
handleAcceptH :: Proxy list -> AcceptHeader -> a -> Maybe (ByteString, ByteString)
170170

171171
instance OVERLAPPABLE_
172-
(AllMimeRender (ct ': cts) a) => AllCTRender (ct ': cts) a where
172+
(Accept ct, AllMime cts, AllMimeRender (ct ': cts) a) => AllCTRender (ct ': cts) a where
173173
handleAcceptH _ (AcceptHeader accept) val = M.mapAcceptMedia lkup accept
174174
where pctyps = Proxy :: Proxy (ct ': cts)
175175
amrs = allMimeRender pctyps val

0 commit comments

Comments
 (0)