git.iko.soy/servant
on master help sign in
Merge pull request #388 from bgamari/master
1807c72Andres Löh
servant-server/servant-server.cabal+1−1
compare with master
unifiedsplit
@@ -66,7 +66,7 @@ library
66 , system-filepath >= 0.4 && < 0.5
66 , system-filepath >= 0.4 && < 0.5
67 , filepath >= 1
67 , filepath >= 1
68 , text >= 1.2 && < 1.3
68 , text >= 1.2 && < 1.3
69− , transformers >= 0.3 && < 0.5
69+ , transformers >= 0.3 && < 0.6
70 , transformers-compat>= 0.4
70 , transformers-compat>= 0.4
71 , wai >= 3.0 && < 3.3
71 , wai >= 3.0 && < 3.3
72 , wai-app-static >= 3.0 && < 3.2
72 , wai-app-static >= 3.0 && < 3.2
servant/src/Servant/API/ContentTypes.hs+1−1
@@ -169,7 +169,7 @@ class (AllMime list) => AllCTRender (list :: [*]) a where
169 handleAcceptH :: Proxy list -> AcceptHeader -> a -> Maybe (ByteString, ByteString)
169 handleAcceptH :: Proxy list -> AcceptHeader -> a -> Maybe (ByteString, ByteString)
170
170
171instance OVERLAPPABLE_
171instance 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
173 handleAcceptH _ (AcceptHeader accept) val = M.mapAcceptMedia lkup accept
173 handleAcceptH _ (AcceptHeader accept) val = M.mapAcceptMedia lkup accept
174 where pctyps = Proxy :: Proxy (ct ': cts)
174 where pctyps = Proxy :: Proxy (ct ': cts)
175 amrs = allMimeRender pctyps val
175 amrs = allMimeRender pctyps val