git.iko.soy/stackage
on b7c6220 help sign in
stackage/patching/patches/fb-0.14.11.patch
78 lines 2.7 kB history raw
1diff -ru orig/fb.cabal new/fb.cabal
2--- orig/fb.cabal 2013-12-04 08:11:01.690633132 +0200
3+++ new/fb.cabal 2013-12-04 08:11:01.000000000 +0200
4@@ -73,7 +73,7 @@
5 , conduit == 1.0.*
6 , data-default
7 , http-types
8- , http-conduit == 1.9.*
9+ , http-conduit >= 1.9 && < 2.1
10 , attoparsec == 0.10.*
11 , attoparsec-conduit == 1.0.*
12 , unordered-containers
13diff -ru orig/src/Facebook/Base.hs new/src/Facebook/Base.hs
14--- orig/src/Facebook/Base.hs 2013-12-04 08:11:01.690633132 +0200
15+++ new/src/Facebook/Base.hs 2013-12-04 08:11:01.000000000 +0200
16@@ -15,6 +15,7 @@
17 import Control.Monad (mzero)
18 import Control.Monad.IO.Class (MonadIO)
19 import Data.ByteString.Char8 (ByteString)
20+import Data.Default (def)
21 import Data.Text (Text)
22 import Data.Typeable (Typeable)
24@@ -49,13 +50,17 @@
25 Text -- ^ Path.
26 -> Maybe (AccessToken anyKind) -- ^ Access token.
27 -> HT.SimpleQuery -- ^ Parameters.
28+#if MIN_VERSION_http_conduit(2, 0, 0)
29+ -> FacebookT anyAuth m H.Request
30+#else
31 -> FacebookT anyAuth m (H.Request n)
32+#endif
33 fbreq path mtoken query =
34 withTier $ \tier ->
35 let host = case tier of
36 Production -> "graph.facebook.com"
37 Beta -> "graph.beta.facebook.com"
38- in H.def { H.secure = True
39+ in def { H.secure = True
40 , H.host = host
41 , H.port = 443
42 , H.path = TE.encodeUtf8 path
43@@ -140,7 +145,11 @@
44 -- | Same as 'H.http', but tries to parse errors and throw
45 -- meaningful 'FacebookException'@s@.
46 fbhttp :: (MonadBaseControl IO m, C.MonadResource m) =>
47+#if MIN_VERSION_http_conduit(2, 0, 0)
48+ H.Request
49+#else
50 H.Request m
51+#endif
52 -> FacebookT anyAuth m (H.Response (C.ResumableSource m ByteString))
53 fbhttp req = do
54 manager <- getManager
55@@ -148,7 +157,11 @@
57 fbhttpHelper :: (MonadBaseControl IO m, C.MonadResource m) =>
58 H.Manager
59+#if MIN_VERSION_http_conduit(2, 0, 0)
60+ -> H.Request
61+#else
62 -> H.Request m
63+#endif
64 -> m (H.Response (C.ResumableSource m ByteString))
65 fbhttpHelper manager req = do
66 let req' = req { H.checkStatus = \_ _ _ -> Nothing }
67@@ -192,7 +205,11 @@
68 -- | Send a @HEAD@ request just to see if the resposne status
69 -- code is 2XX (returns @True@) or not (returns @False@).
70 httpCheck :: (MonadBaseControl IO m, C.MonadResource m) =>
71+#if MIN_VERSION_http_conduit(2, 0, 0)
72+ H.Request
73+#else
74 H.Request (C.ResourceT m)
75+#endif
76 -> FacebookT anyAuth m Bool
78 httpCheck req = runResourceInFb $ do