From 0d45d8ebf3d3e2eda199c48e0fa3d27a35dd391e Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 30 Mar 2014 13:31:38 +0300 Subject: [PATCH] Patches and bounds --- Stackage/Config.hs | 6 +- .../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 | 22 +++++- 4 files changed, 110 insertions(+), 7 deletions(-) create mode 100644 patching/patches/process-conduit-1.0.0.1.patch create mode 100644 patching/patches/yesod-auth-fb-1.6.1.patch diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 93e62142..00b62b9b 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -355,9 +355,6 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do -- https://github.com/fpco/stackage/issues/200 addRange "Michael Snoyman" "hspec" "< 1.9" - -- https://github.com/fpco/stackage/issues/201 - addRange "Michael Snoyman" "yesod-auth" "< 1.3" - -- https://github.com/fpco/stackage/issues/202 addRange "Michael Snoyman" "case-insensitive" "< 1.2" addRange "Michael Snoyman" "xml-conduit" "< 1.2" @@ -371,6 +368,9 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do -- https://github.com/ozataman/csv-conduit/issues/10 addRange "Michael Snoyman" "csv-conduit" "< 0.6.2 || > 0.6.2" + -- https://github.com/ekmett/ad/issues/34 + addRange "Michael Snoyman" "ad" "< 4.0 || > 4.0" + -- Requires too new a version of text when (ghcVer == GhcMajorVersion 7 4 && requireHP) $ do addRange "Michael snoyman" "attoparsec" "< 0.11.2.1" diff --git a/patching/patches/process-conduit-1.0.0.1.patch b/patching/patches/process-conduit-1.0.0.1.patch new file mode 100644 index 00000000..16ba9923 --- /dev/null +++ b/patching/patches/process-conduit-1.0.0.1.patch @@ -0,0 +1,12 @@ +Only in new: dist +diff -ru orig/process-conduit.cabal new/process-conduit.cabal +--- orig/process-conduit.cabal 2014-03-30 12:27:40.781431440 +0300 ++++ new/process-conduit.cabal 2014-03-30 12:27:40.000000000 +0300 +@@ -35,6 +35,7 @@ + , process >= 1.0 + , conduit == 1.0.* + , shakespeare-text >= 1.0 ++ , shakespeare + + ghc-options: -Wall + diff --git a/patching/patches/yesod-auth-fb-1.6.1.patch b/patching/patches/yesod-auth-fb-1.6.1.patch new file mode 100644 index 00000000..c1f87860 --- /dev/null +++ b/patching/patches/yesod-auth-fb-1.6.1.patch @@ -0,0 +1,77 @@ +diff -ru orig/demo/clientside.hs new/demo/clientside.hs +--- orig/demo/clientside.hs 2014-03-30 12:27:40.941431437 +0300 ++++ new/demo/clientside.hs 2014-03-30 12:27:40.000000000 +0300 +@@ -27,7 +27,7 @@ + + + instance Yesod Test where +- approot = ApprootStatic "http://dev.whonodes.org:3000" ++ approot = FIXME -- FIXME: Put your approot here + + instance RenderMessage Test FormMessage where + renderMessage _ _ = englishFormMessage +diff -ru orig/src/Yesod/Auth/Facebook/ClientSide.hs new/src/Yesod/Auth/Facebook/ClientSide.hs +--- orig/src/Yesod/Auth/Facebook/ClientSide.hs 2014-03-30 12:27:40.941431437 +0300 ++++ new/src/Yesod/Auth/Facebook/ClientSide.hs 2014-03-30 12:27:40.000000000 +0300 +@@ -364,7 +364,7 @@ + AuthPlugin "fbcs" dispatch login + where + dispatch :: YesodAuthFbClientSide site => +- Text -> [Text] -> HandlerT Auth (HandlerT site IO) () ++ Text -> [Text] -> HandlerT Auth (HandlerT site IO) TypedContent + -- Login route used when successfully logging in. Called via + -- AJAX by JavaScript code on 'facebookJSSDK'. + dispatch "GET" ["login"] = do +@@ -372,7 +372,7 @@ + when (redirectToReferer y) (lift setUltDestReferer) + etoken <- lift getUserAccessTokenFromFbCookie + case etoken of +- Right token -> lift $ setCreds True (createCreds token) ++ Right token -> lift $ setCredsRedirect (createCreds token) + Left msg -> fail msg + + -- Login routes used to forcefully require the user to login. +@@ -406,7 +406,7 @@ + token <- lift $ + YF.runYesodFbT $ + FB.getUserAccessTokenStep2 proceedUrl query' +- lift $ setCreds True (createCreds token) ++ lift $ setCredsRedirect (createCreds token) + + -- Everything else gives 404 + dispatch _ _ = notFound +diff -ru orig/src/Yesod/Auth/Facebook/ServerSide.hs new/src/Yesod/Auth/Facebook/ServerSide.hs +--- orig/src/Yesod/Auth/Facebook/ServerSide.hs 2014-03-30 12:27:40.941431437 +0300 ++++ new/src/Yesod/Auth/Facebook/ServerSide.hs 2014-03-30 12:27:40.000000000 +0300 +@@ -56,7 +56,7 @@ + proceedR = PluginR "fb" ["proceed"] + + dispatch :: (YesodAuth site, YF.YesodFacebook site) => +- Text -> [Text] -> HandlerT Auth (HandlerT site IO) () ++ Text -> [Text] -> HandlerT Auth (HandlerT site IO) TypedContent + -- Redirect the user to Facebook. + dispatch "GET" ["login"] = do + ur <- getUrlRender +@@ -73,7 +73,7 @@ + lift $ do + token <- YF.runYesodFbT $ FB.getUserAccessTokenStep2 proceedUrl query' + setUserAccessToken token +- setCreds True (createCreds token) ++ setCredsRedirect (createCreds token) + -- Logout the user from our site and from Facebook. + dispatch "GET" ["logout"] = do + y <- lift getYesod +diff -ru orig/yesod-auth-fb.cabal new/yesod-auth-fb.cabal +--- orig/yesod-auth-fb.cabal 2014-03-30 12:27:40.945431436 +0300 ++++ new/yesod-auth-fb.cabal 2014-03-30 12:27:40.000000000 +0300 +@@ -43,8 +43,9 @@ + Build-depends: base >= 4.3 && < 5 + , lifted-base >= 0.1 && < 0.3 + , yesod-core == 1.2.* +- , yesod-auth == 1.2.* ++ , yesod-auth == 1.3.* + , hamlet ++ , shakespeare + , shakespeare-js >= 1.0.2 + , wai + , http-conduit >= 1.9 diff --git a/patching/patches/yesod-auth-oauth-1.2.0.patch b/patching/patches/yesod-auth-oauth-1.2.0.patch index 8d99426c..6289e36b 100644 --- a/patching/patches/yesod-auth-oauth-1.2.0.patch +++ b/patching/patches/yesod-auth-oauth-1.2.0.patch @@ -1,11 +1,25 @@ +diff -ru orig/Yesod/Auth/OAuth.hs new/Yesod/Auth/OAuth.hs +--- orig/Yesod/Auth/OAuth.hs 2014-03-30 12:34:43.941422434 +0300 ++++ new/Yesod/Auth/OAuth.hs 2014-03-30 12:34:43.000000000 +0300 +@@ -72,7 +72,7 @@ + master <- getYesod + accTok <- getAccessToken oauth reqTok (authHttpManager master) + creds <- liftIO $ mkCreds accTok +- setCreds True creds ++ setCredsRedirect creds + dispatch _ _ = notFound + login tm = do + render <- getUrlRender diff -ru orig/yesod-auth-oauth.cabal new/yesod-auth-oauth.cabal ---- orig/yesod-auth-oauth.cabal 2014-03-13 07:47:41.773928001 +0200 -+++ new/yesod-auth-oauth.cabal 2014-03-13 07:47:41.000000000 +0200 -@@ -24,7 +24,7 @@ +--- orig/yesod-auth-oauth.cabal 2014-03-30 12:34:43.941422434 +0300 ++++ new/yesod-auth-oauth.cabal 2014-03-30 12:34:43.000000000 +0300 +@@ -23,8 +23,8 @@ + build-depends: authenticate-oauth >= 1.4 && < 1.5 , bytestring >= 0.9.1.4 , yesod-core >= 1.2 && < 1.3 - , yesod-auth >= 1.2 && < 1.3 +- , yesod-auth >= 1.2 && < 1.3 - , text >= 0.7 && < 0.12 ++ , yesod-auth >= 1.3 && < 1.4 + , text >= 0.7 && < 1.2 , yesod-form >= 1.3 && < 1.4 , transformers >= 0.2.2 && < 0.4