git.iko.soy/stackage
on master help sign in
Patches and bounds
commit0d45d8ebf3d3e2eda199c48e0fa3d27a35dd391e authorMichael Snoyman <michael@snoyman.com> dateSun 30 Mar 2014, 13:31 (13 years ago) parent22ebf28
4 files changed+110−7
compare with master
unifiedsplit
Stackage/Config.hs+3−3 patching/patches/process-conduit-1.0.0.1.patch+12 patching/patches/yesod-auth-fb-1.6.1.patch+77 patching/patches/yesod-auth-oauth-1.2.0.patch+18−4
Stackage/Config.hs+3−3
@@ -355,9 +355,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
355355 -- https://github.com/fpco/stackage/issues/200
356356 addRange "Michael Snoyman" "hspec" "< 1.9"
357357
358− -- https://github.com/fpco/stackage/issues/201
359− addRange "Michael Snoyman" "yesod-auth" "< 1.3"
360−
361358 -- https://github.com/fpco/stackage/issues/202
362359 addRange "Michael Snoyman" "case-insensitive" "< 1.2"
363360 addRange "Michael Snoyman" "xml-conduit" "< 1.2"
@@ -371,6 +368,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do
371368 -- https://github.com/ozataman/csv-conduit/issues/10
372369 addRange "Michael Snoyman" "csv-conduit" "< 0.6.2 || > 0.6.2"
373370
371+ -- https://github.com/ekmett/ad/issues/34
372+ addRange "Michael Snoyman" "ad" "< 4.0 || > 4.0"
373+
374374 -- Requires too new a version of text
375375 when (ghcVer == GhcMajorVersion 7 4 && requireHP) $ do
376376 addRange "Michael snoyman" "attoparsec" "< 0.11.2.1"
patching/patches/process-conduit-1.0.0.1.patchnew file+12
@@ -0,0 +1,12 @@
1+Only in new: dist
2+diff -ru orig/process-conduit.cabal new/process-conduit.cabal
3+--- orig/process-conduit.cabal 2014-03-30 12:27:40.781431440 +0300
4++++ new/process-conduit.cabal 2014-03-30 12:27:40.000000000 +0300
5+@@ -35,6 +35,7 @@
6+ , process >= 1.0
7+ , conduit == 1.0.*
8+ , shakespeare-text >= 1.0
9++ , shakespeare
10+
11+ ghc-options: -Wall
12+
patching/patches/yesod-auth-fb-1.6.1.patchnew file+77
@@ -0,0 +1,77 @@
1+diff -ru orig/demo/clientside.hs new/demo/clientside.hs
2+--- orig/demo/clientside.hs 2014-03-30 12:27:40.941431437 +0300
3++++ new/demo/clientside.hs 2014-03-30 12:27:40.000000000 +0300
4+@@ -27,7 +27,7 @@
5+
6+
7+ instance Yesod Test where
8+- approot = ApprootStatic "http://dev.whonodes.org:3000"
9++ approot = FIXME -- FIXME: Put your approot here
10+
11+ instance RenderMessage Test FormMessage where
12+ renderMessage _ _ = englishFormMessage
13+diff -ru orig/src/Yesod/Auth/Facebook/ClientSide.hs new/src/Yesod/Auth/Facebook/ClientSide.hs
14+--- orig/src/Yesod/Auth/Facebook/ClientSide.hs 2014-03-30 12:27:40.941431437 +0300
15++++ new/src/Yesod/Auth/Facebook/ClientSide.hs 2014-03-30 12:27:40.000000000 +0300
16+@@ -364,7 +364,7 @@
17+ AuthPlugin "fbcs" dispatch login
18+ where
19+ dispatch :: YesodAuthFbClientSide site =>
20+- Text -> [Text] -> HandlerT Auth (HandlerT site IO) ()
21++ Text -> [Text] -> HandlerT Auth (HandlerT site IO) TypedContent
22+ -- Login route used when successfully logging in. Called via
23+ -- AJAX by JavaScript code on 'facebookJSSDK'.
24+ dispatch "GET" ["login"] = do
25+@@ -372,7 +372,7 @@
26+ when (redirectToReferer y) (lift setUltDestReferer)
27+ etoken <- lift getUserAccessTokenFromFbCookie
28+ case etoken of
29+- Right token -> lift $ setCreds True (createCreds token)
30++ Right token -> lift $ setCredsRedirect (createCreds token)
31+ Left msg -> fail msg
32+
33+ -- Login routes used to forcefully require the user to login.
34+@@ -406,7 +406,7 @@
35+ token <- lift $
36+ YF.runYesodFbT $
37+ FB.getUserAccessTokenStep2 proceedUrl query'
38+- lift $ setCreds True (createCreds token)
39++ lift $ setCredsRedirect (createCreds token)
40+
41+ -- Everything else gives 404
42+ dispatch _ _ = notFound
43+diff -ru orig/src/Yesod/Auth/Facebook/ServerSide.hs new/src/Yesod/Auth/Facebook/ServerSide.hs
44+--- orig/src/Yesod/Auth/Facebook/ServerSide.hs 2014-03-30 12:27:40.941431437 +0300
45++++ new/src/Yesod/Auth/Facebook/ServerSide.hs 2014-03-30 12:27:40.000000000 +0300
46+@@ -56,7 +56,7 @@
47+ proceedR = PluginR "fb" ["proceed"]
48+
49+ dispatch :: (YesodAuth site, YF.YesodFacebook site) =>
50+- Text -> [Text] -> HandlerT Auth (HandlerT site IO) ()
51++ Text -> [Text] -> HandlerT Auth (HandlerT site IO) TypedContent
52+ -- Redirect the user to Facebook.
53+ dispatch "GET" ["login"] = do
54+ ur <- getUrlRender
55+@@ -73,7 +73,7 @@
56+ lift $ do
57+ token <- YF.runYesodFbT $ FB.getUserAccessTokenStep2 proceedUrl query'
58+ setUserAccessToken token
59+- setCreds True (createCreds token)
60++ setCredsRedirect (createCreds token)
61+ -- Logout the user from our site and from Facebook.
62+ dispatch "GET" ["logout"] = do
63+ y <- lift getYesod
64+diff -ru orig/yesod-auth-fb.cabal new/yesod-auth-fb.cabal
65+--- orig/yesod-auth-fb.cabal 2014-03-30 12:27:40.945431436 +0300
66++++ new/yesod-auth-fb.cabal 2014-03-30 12:27:40.000000000 +0300
67+@@ -43,8 +43,9 @@
68+ Build-depends: base >= 4.3 && < 5
69+ , lifted-base >= 0.1 && < 0.3
70+ , yesod-core == 1.2.*
71+- , yesod-auth == 1.2.*
72++ , yesod-auth == 1.3.*
73+ , hamlet
74++ , shakespeare
75+ , shakespeare-js >= 1.0.2
76+ , wai
77+ , http-conduit >= 1.9
patching/patches/yesod-auth-oauth-1.2.0.patch+18−4
@@ -1,11 +1,25 @@
1+diff -ru orig/Yesod/Auth/OAuth.hs new/Yesod/Auth/OAuth.hs
2+--- orig/Yesod/Auth/OAuth.hs 2014-03-30 12:34:43.941422434 +0300
3++++ new/Yesod/Auth/OAuth.hs 2014-03-30 12:34:43.000000000 +0300
4+@@ -72,7 +72,7 @@
5+ master <- getYesod
6+ accTok <- getAccessToken oauth reqTok (authHttpManager master)
7+ creds <- liftIO $ mkCreds accTok
8+- setCreds True creds
9++ setCredsRedirect creds
10+ dispatch _ _ = notFound
11+ login tm = do
12+ render <- getUrlRender
113diff -ru orig/yesod-auth-oauth.cabal new/yesod-auth-oauth.cabal
2−--- orig/yesod-auth-oauth.cabal 2014-03-13 07:47:41.773928001 +0200
3−+++ new/yesod-auth-oauth.cabal 2014-03-13 07:47:41.000000000 +0200
4−@@ -24,7 +24,7 @@
14+--- orig/yesod-auth-oauth.cabal 2014-03-30 12:34:43.941422434 +0300
15++++ new/yesod-auth-oauth.cabal 2014-03-30 12:34:43.000000000 +0300
16+@@ -23,8 +23,8 @@
17+ build-depends: authenticate-oauth >= 1.4 && < 1.5
518 , bytestring >= 0.9.1.4
619 , yesod-core >= 1.2 && < 1.3
7− , yesod-auth >= 1.2 && < 1.3
20+- , yesod-auth >= 1.2 && < 1.3
821- , text >= 0.7 && < 0.12
22++ , yesod-auth >= 1.3 && < 1.4
923+ , text >= 0.7 && < 1.2
1024 , yesod-form >= 1.3 && < 1.4
1125 , transformers >= 0.2.2 && < 0.4