Date: Saturday, April 16, 2016 @ 06:44:39 Author: fyan Revision: 171151
upgpkg: haskell-yesod-core 1.4.20.1-3 rebuild with fast-logger-2.4.5, persistent-2.5, persistent-sqlite-2.5, persistent-template-2.5, yaml-0.8.17.1, http-client-0.4.28, http-client-tls-0.2.4, http-conduit-2.1.10, shakespeare-2.0.8.1, wai-3.2.1, wai-logger-2.2.6 Added: haskell-yesod-core/trunk/date-cache.patch Modified: haskell-yesod-core/trunk/PKGBUILD ------------------+ PKGBUILD | 13 +++++++------ date-cache.patch | 25 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-04-16 04:13:25 UTC (rev 171150) +++ PKGBUILD 2016-04-16 04:44:39 UTC (rev 171151) @@ -24,16 +24,17 @@ "haskell-unordered-containers" "haskell-vector" "haskell-wai" "haskell-wai-extra" "haskell-wai-logger" "haskell-warp" "haskell-word8") options=('staticlibs') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") +source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz" + date-cache.patch) install="${pkgname}.install" -sha256sums=('e742d6cb5b7f65b97f9dbb7e9586ef4cc27169aa7ac7a030119e6c52b69c4f86') +sha256sums=('e742d6cb5b7f65b97f9dbb7e9586ef4cc27169aa7ac7a030119e6c52b69c4f86' + '4eb8e78836f118e16de0d7a94c1d72421b83c6001825766300b961bf398c985e') prepare() { + cd "${srcdir}/${_hkgname}-${pkgver}" + # https://github.com/yesodweb/yesod/issues/1214 - sed -e 's/Network.Wai.Logger/System.Data.Cache/' \ - -i ${_hkgname}-${pkgver}/Yesod/Core/Types.hs - sed -e '/, data-default/a \, date-cache' \ - -i ${_hkgname}-${pkgver}/${_hkgname}.cabal + patch -p2 -i ../date-cache.patch } build() { Added: date-cache.patch =================================================================== --- date-cache.patch (rev 0) +++ date-cache.patch 2016-04-16 04:44:39 UTC (rev 171151) @@ -0,0 +1,25 @@ +diff --git a/yesod-core/Yesod/Core/Types.hs b/yesod-core/Yesod/Core/Types.hs +index d8a2b2e..6b24154 100644 +--- a/yesod-core/Yesod/Core/Types.hs ++++ b/yesod-core/Yesod/Core/Types.hs +@@ -49,7 +49,7 @@ import qualified Network.Wai as W + import qualified Network.Wai.Parse as NWP + import System.Log.FastLogger (LogStr, LoggerSet, toLogStr, pushLogStr) + import qualified System.Random.MWC as MWC +-import Network.Wai.Logger (DateCacheGetter) ++import System.Date.Cache (DateCacheGetter) + import Text.Blaze.Html (Html, toHtml) + import Text.Hamlet (HtmlUrl) + import Text.Julius (JavascriptUrl) +diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal +index 1ed8b27..cfa34bb 100644 +--- a/yesod-core/yesod-core.cabal ++++ b/yesod-core/yesod-core.cabal +@@ -51,6 +51,7 @@ library + , aeson >= 0.5 + , fast-logger >= 2.2 + , wai-logger >= 0.2 ++ , date-cache + , monad-logger >= 0.3.1 && < 0.4 + , conduit >= 1.2 + , resourcet >= 0.4.9 && < 1.2