[Pkg-haskell-commits] [package-plan] 01/01: yesod updates and patches
Clint Adams
clint at moszumanska.debian.org
Tue Jun 10 11:34:38 UTC 2014
This is an automated email from the git hooks/post-receive script.
clint pushed a commit to branch conduit-1.1
in repository package-plan.
commit d3307fb345230df456721c911ffb40ba379ed70a
Author: Clint Adams <clint at debian.org>
Date: Tue Jun 10 07:34:22 2014 -0400
yesod updates and patches
---
packages.txt | 10 ++++----
.../yesod-auth-oauth/1.2.0/newer-yesod-auth.diff | 22 +++++++++++++++++
patches/yesod-auth-oauth/1.2.0/series | 1 +
.../yesod-auth/1.3.1/no-attoparsec-conduit.diff | 10 ++++++++
patches/yesod-auth/1.3.1/series | 1 +
...-attoparsec-conduit-and-no-network-conduit.diff | 18 ++++++++++++++
patches/yesod-core/1.2.16.1/no-wai-test.diff | 28 ++++++++++++++++++++++
patches/yesod-core/1.2.16.1/series | 2 ++
patches/yesod/1.2.6/no-network-conduit.diff | 10 ++++++++
patches/yesod/1.2.6/series | 1 +
10 files changed, 98 insertions(+), 5 deletions(-)
diff --git a/packages.txt b/packages.txt
index 0e15a4c..5494bc1 100644
--- a/packages.txt
+++ b/packages.txt
@@ -716,17 +716,17 @@ xmonad-contrib 0.11.3
xss-sanitize 0.3.4
yaml 0.8.8.3
yaml-light 0.1.4
-yesod 1.2.5.2
-yesod-auth 1.2.7.1
+yesod 1.2.6
+yesod-auth 1.3.1
yesod-auth-account 1.2.5
yesod-auth-oauth 1.2.0
yesod-bin 1.2.10.2 binary=yesod
-yesod-core 1.2.16
+yesod-core 1.2.16.1
yesod-default 1.2.0
-yesod-form 1.3.8.3
+yesod-form 1.3.10
yesod-markdown 0.8.2
yesod-newsfeed 1.2.0.2
-yesod-persistent 1.2.2.3
+yesod-persistent 1.2.3
yesod-routes 1.2.0.1
yesod-static 1.2.4
yesod-test 1.2.1.5
diff --git a/patches/yesod-auth-oauth/1.2.0/newer-yesod-auth.diff b/patches/yesod-auth-oauth/1.2.0/newer-yesod-auth.diff
new file mode 100644
index 0000000..d50c692
--- /dev/null
+++ b/patches/yesod-auth-oauth/1.2.0/newer-yesod-auth.diff
@@ -0,0 +1,22 @@
+--- a/yesod-auth-oauth.cabal
++++ b/yesod-auth-oauth.cabal
+@@ -23,7 +23,7 @@
+ 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.3 && < 1.4
+ , text >= 0.7 && < 0.12
+ , yesod-form >= 1.3 && < 1.4
+ , transformers >= 0.2.2 && < 0.4
+--- a/Yesod/Auth/OAuth.hs
++++ b/Yesod/Auth/OAuth.hs
+@@ -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 --git a/patches/yesod-auth-oauth/1.2.0/series b/patches/yesod-auth-oauth/1.2.0/series
new file mode 100644
index 0000000..f56ad31
--- /dev/null
+++ b/patches/yesod-auth-oauth/1.2.0/series
@@ -0,0 +1 @@
+newer-yesod-auth.diff
diff --git a/patches/yesod-auth/1.3.1/no-attoparsec-conduit.diff b/patches/yesod-auth/1.3.1/no-attoparsec-conduit.diff
new file mode 100644
index 0000000..06c278f
--- /dev/null
+++ b/patches/yesod-auth/1.3.1/no-attoparsec-conduit.diff
@@ -0,0 +1,10 @@
+--- a/yesod-auth.cabal
++++ b/yesod-auth.cabal
+@@ -63,7 +63,6 @@
+ , blaze-builder
+ , conduit
+ , conduit-extra
+- , attoparsec-conduit
+
+ exposed-modules: Yesod.Auth
+ Yesod.Auth.BrowserId
diff --git a/patches/yesod-auth/1.3.1/series b/patches/yesod-auth/1.3.1/series
new file mode 100644
index 0000000..89ad6b7
--- /dev/null
+++ b/patches/yesod-auth/1.3.1/series
@@ -0,0 +1 @@
+no-attoparsec-conduit.diff
diff --git a/patches/yesod-core/1.2.16.1/no-attoparsec-conduit-and-no-network-conduit.diff b/patches/yesod-core/1.2.16.1/no-attoparsec-conduit-and-no-network-conduit.diff
new file mode 100644
index 0000000..20b0790
--- /dev/null
+++ b/patches/yesod-core/1.2.16.1/no-attoparsec-conduit-and-no-network-conduit.diff
@@ -0,0 +1,18 @@
+--- a/yesod-core.cabal
++++ b/yesod-core.cabal
+@@ -60,7 +60,6 @@
+ , conduit >= 1.0.11
+ , resourcet >= 0.4.9 && < 1.2
+ , lifted-base >= 0.1.2
+- , attoparsec-conduit
+ , blaze-html >= 0.5
+ , blaze-markup >= 0.5.1
+ , data-default
+@@ -125,7 +124,6 @@
+ , containers
+ , lifted-base
+ , resourcet
+- , network-conduit
+ , network
+ , async
+ , conduit-extra
diff --git a/patches/yesod-core/1.2.16.1/no-wai-test.diff b/patches/yesod-core/1.2.16.1/no-wai-test.diff
new file mode 100644
index 0000000..d8bf1a4
--- /dev/null
+++ b/patches/yesod-core/1.2.16.1/no-wai-test.diff
@@ -0,0 +1,28 @@
+--- a/yesod-core.cabal
++++ b/yesod-core.cabal
+@@ -27,7 +27,7 @@
+ , time >= 1.1.4
+ , yesod-routes >= 1.2 && < 1.3
+ , wai >= 1.4
+- , wai-extra >= 1.3
++ , wai-extra >= 3.0
+ , bytestring >= 0.9.1.4
+ , text >= 0.7
+ , template-haskell
+@@ -106,7 +106,6 @@
+ cpp-options: -DTEST
+ build-depends: base
+ ,hspec >= 1.3
+- ,wai-test >= 1.3.0.5
+ ,wai
+ ,yesod-core
+ ,bytestring
+@@ -129,7 +128,7 @@
+ , conduit-extra
+ , shakespeare
+ , streaming-commons
+- , wai-extra
++ , wai-extra >= 3.0
+ ghc-options: -Wall
+ extensions: TemplateHaskell
+
diff --git a/patches/yesod-core/1.2.16.1/series b/patches/yesod-core/1.2.16.1/series
new file mode 100644
index 0000000..79c7bfb
--- /dev/null
+++ b/patches/yesod-core/1.2.16.1/series
@@ -0,0 +1,2 @@
+no-attoparsec-conduit-and-no-network-conduit.diff
+no-wai-test.diff
diff --git a/patches/yesod/1.2.6/no-network-conduit.diff b/patches/yesod/1.2.6/no-network-conduit.diff
new file mode 100644
index 0000000..41d79e5
--- /dev/null
+++ b/patches/yesod/1.2.6/no-network-conduit.diff
@@ -0,0 +1,10 @@
+--- a/yesod.cabal
++++ b/yesod.cabal
+@@ -39,7 +39,6 @@
+ , aeson
+ , safe
+ , data-default
+- , network-conduit
+ , unordered-containers
+ , yaml
+ , text
diff --git a/patches/yesod/1.2.6/series b/patches/yesod/1.2.6/series
new file mode 100644
index 0000000..9626b40
--- /dev/null
+++ b/patches/yesod/1.2.6/series
@@ -0,0 +1 @@
+no-network-conduit.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git
More information about the Pkg-haskell-commits
mailing list