haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-12 15:28:29 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove some unneeded patches

Browse Source
This commit is contained in:
Michael Snoyman 2014-02-19 19:00:37 +02:00
parent ca0044136f
commit e64cf0da5d
3 changed files with 0 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
patching/patches/fb-0.14.11.patch
View File

@ -1,78 +0,0 @@
diff -ru orig/fb.cabal new/fb.cabal
--- orig/fb.cabal 2013-12-04 08:11:01.690633132 +0200
+++ new/fb.cabal 2013-12-04 08:11:01.000000000 +0200
@@ -73,7 +73,7 @@
, conduit == 1.0.*
, data-default
, http-types
- , http-conduit == 1.9.*
+ , http-conduit >= 1.9 && < 2.1
, attoparsec == 0.10.*
, attoparsec-conduit == 1.0.*
, unordered-containers
diff -ru orig/src/Facebook/Base.hs new/src/Facebook/Base.hs
--- orig/src/Facebook/Base.hs 2013-12-04 08:11:01.690633132 +0200
+++ new/src/Facebook/Base.hs 2013-12-04 08:11:01.000000000 +0200
@@ -15,6 +15,7 @@
import Control.Monad (mzero)
import Control.Monad.IO.Class (MonadIO)
import Data.ByteString.Char8 (ByteString)
+import Data.Default (def)
import Data.Text (Text)
import Data.Typeable (Typeable)
@@ -49,13 +50,17 @@
Text -- ^ Path.
-> Maybe (AccessToken anyKind) -- ^ Access token.
-> HT.SimpleQuery -- ^ Parameters.
+#if MIN_VERSION_http_conduit(2, 0, 0)
+ -> FacebookT anyAuth m H.Request
+#else
-> FacebookT anyAuth m (H.Request n)
+#endif
fbreq path mtoken query =
withTier $ \tier ->
let host = case tier of
Production -> "graph.facebook.com"
Beta -> "graph.beta.facebook.com"
- in H.def { H.secure = True
+ in def { H.secure = True
, H.host = host
, H.port = 443
, H.path = TE.encodeUtf8 path
@@ -140,7 +145,11 @@
-- | Same as 'H.http', but tries to parse errors and throw
-- meaningful 'FacebookException'@s@.
fbhttp :: (MonadBaseControl IO m, C.MonadResource m) =>
+#if MIN_VERSION_http_conduit(2, 0, 0)
+ H.Request
+#else
H.Request m
+#endif
-> FacebookT anyAuth m (H.Response (C.ResumableSource m ByteString))
fbhttp req = do
manager <- getManager
@@ -148,7 +157,11 @@
fbhttpHelper :: (MonadBaseControl IO m, C.MonadResource m) =>
H.Manager
+#if MIN_VERSION_http_conduit(2, 0, 0)
+ -> H.Request
+#else
-> H.Request m
+#endif
-> m (H.Response (C.ResumableSource m ByteString))
fbhttpHelper manager req = do
let req' = req { H.checkStatus = \_ _ _ -> Nothing }
@@ -192,7 +205,11 @@
-- | Send a @HEAD@ request just to see if the resposne status
-- code is 2XX (returns @True@) or not (returns @False@).
httpCheck :: (MonadBaseControl IO m, C.MonadResource m) =>
+#if MIN_VERSION_http_conduit(2, 0, 0)
+ H.Request
+#else
H.Request (C.ResourceT m)
+#endif
-> FacebookT anyAuth m Bool
httpCheck req = runResourceInFb $ do

12
patching/patches/fb-persistent-0.3.1.patch
View File

@ -1,12 +0,0 @@
diff -ru orig/fb-persistent.cabal new/fb-persistent.cabal
--- orig/fb-persistent.cabal 2013-12-26 14:17:59.531602454 +0200
+++ new/fb-persistent.cabal 2013-12-26 14:17:59.000000000 +0200
@@ -32,7 +32,7 @@
build-depends:
base >= 4 && < 5
, fb >= 0.13
- , persistent == 1.2.*
+ , persistent >= 1.2 && < 1.4
, cereal >= 0.3 && < 0.5
, time == 1.4.*
, text

14
patching/patches/yesod-eventsource-1.1.patch
View File

@ -1,14 +0,0 @@
diff -ru orig/yesod-eventsource.cabal new/yesod-eventsource.cabal
--- orig/yesod-eventsource.cabal 2013-12-04 07:32:48.638605826 +0200
+++ new/yesod-eventsource.cabal 2013-12-04 07:32:48.000000000 +0200
@@ -30,8 +30,8 @@
build-depends: base >= 4 && < 5
, yesod-core == 1.2.*
, conduit >= 0.5 && < 1.1
- , wai >= 1.3 && < 1.5
- , wai-eventsource >= 1.3 && < 1.4
+ , wai >= 1.3
+ , wai-eventsource >= 1.3
, blaze-builder
, transformers
exposed-modules: Yesod.EventSource