git.iko.soy/typeable/servant
on master help sign in
Merge pull request #388 from bgamari/master

Compatibility with GHC 8.0

commit1807c72c8a0fbd8d2ed93617273fcc7b2fad0ba1 authorAndres Löh <ksgithub@andres-loeh.de> dateWed 13 Apr 2016, 15:09 (11 years ago) parent15143ccc6e5126
2 files changed+2−2
compare with master
unifiedsplit
servant-server/servant-server.cabal+1−1 servant/src/Servant/API/ContentTypes.hs+1−1
servant-server/servant-server.cabal+1−1
@@ -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+1−1
@@ -169,7 +169,7 @@ class (AllMime list) => AllCTRender (list :: [*]) a where
169169 handleAcceptH :: Proxy list -> AcceptHeader -> a -> Maybe (ByteString, ByteString)
170170
171171instance 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