From 8b1a6753390d2a4582681505701a4fb99d1c28f6 Mon Sep 17 00:00:00 2001 From: "jp.rider63" Date: Tue, 3 Jun 2014 13:57:27 -0400 Subject: [PATCH 1/3] upped conduit version dependency --- yesod-core/yesod-core.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index c2c5c915..13b286ac 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -57,7 +57,7 @@ library , fast-logger >= 0.2 , wai-logger >= 0.2 , monad-logger >= 0.3.1 && < 0.4 - , conduit >= 0.5 + , conduit >= 1.0.11 , resourcet >= 0.4.9 && < 0.5 , lifted-base >= 0.1.2 , attoparsec-conduit From 0d599e463a3b64dfb5a5a6be5e332ae5bc7c95a6 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 5 Jun 2014 06:05:47 +0300 Subject: [PATCH 2/3] Version bumps --- yesod-core/yesod-core.cabal | 2 +- yesod-form/yesod-form.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 2f1f9b90..e3cf9da1 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -1,5 +1,5 @@ name: yesod-core -version: 1.2.15.1 +version: 1.2.15.2 license: MIT license-file: LICENSE author: Michael Snoyman diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal index 56a30530..5da95aa1 100644 --- a/yesod-form/yesod-form.cabal +++ b/yesod-form/yesod-form.cabal @@ -1,5 +1,5 @@ name: yesod-form -version: 1.3.9 +version: 1.3.9.1 license: MIT license-file: LICENSE author: Michael Snoyman From d42ba4d024c612ec74d5510e9661b943f441962a Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 5 Jun 2014 15:12:14 +0300 Subject: [PATCH 3/3] Fix a conditional --- yesod/Yesod/Default/Main.hs | 2 +- yesod/yesod.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yesod/Yesod/Default/Main.hs b/yesod/Yesod/Default/Main.hs index e273de2b..565ed353 100644 --- a/yesod/Yesod/Default/Main.hs +++ b/yesod/Yesod/Default/Main.hs @@ -77,7 +77,7 @@ defaultMainLog load getApp = do } app where shouldLog' = -#if MIN_VERSION_wai(2,1,3) +#if MIN_VERSION_warp(2,1,3) Warp.defaultShouldDisplayException #else const True diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index 54bd9a15..2cef56c1 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -1,5 +1,5 @@ name: yesod -version: 1.2.5.2 +version: 1.2.5.3 license: MIT license-file: LICENSE author: Michael Snoyman