Date: Monday, April 18, 2016 @ 07:31:52 Author: fyan Revision: 171294
upgpkg: haskell-yesod-auth 1.4.13.1-4 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-auth/trunk/persistent-2.5.patch Modified: haskell-yesod-auth/trunk/PKGBUILD ----------------------+ PKGBUILD | 13 +++++++++--- persistent-2.5.patch | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-04-18 04:52:53 UTC (rev 171293) +++ PKGBUILD 2016-04-18 05:31:52 UTC (rev 171294) @@ -5,7 +5,7 @@ _hkgname=yesod-auth pkgname=haskell-yesod-auth pkgver=1.4.13.1 -pkgrel=3 +pkgrel=4 pkgdesc="Authentication for Yesod." url="http://www.yesodweb.com/"; license=("MIT") @@ -21,10 +21,17 @@ "haskell-unordered-containers" "haskell-wai" "haskell-yesod-core" "haskell-yesod-form" "haskell-yesod-persistent") 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"; + persistent-2.5.patch) install="${pkgname}.install" -sha256sums=('cb1ff6df7624c2b46f404e02b6ee0e3dc218c8a73196dbb824e7bb0e18a88852') +sha256sums=('cb1ff6df7624c2b46f404e02b6ee0e3dc218c8a73196dbb824e7bb0e18a88852' + '1c89987092728c606c0f37b2e0cab5c0678741be2d2962670def0f23b6d310ee') +prepare() { + cd "${srcdir}/${_hkgname}-${pkgver}" + patch -p2 -i ../persistent-2.5.patch +} + build() { cd "${srcdir}/${_hkgname}-${pkgver}" Added: persistent-2.5.patch =================================================================== --- persistent-2.5.patch (rev 0) +++ persistent-2.5.patch 2016-04-18 05:31:52 UTC (rev 171294) @@ -0,0 +1,52 @@ +From e95fa133303026833c2606dc8270ed0d79bd58bf Mon Sep 17 00:00:00 2001 +From: Erik de Castro Lopo <[email protected]> +Date: Mon, 18 Apr 2016 11:43:54 +1000 +Subject: [PATCH] yesod-auth: Fixes for persistent 2.5 + +--- + yesod-auth/Yesod/Auth.hs | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/yesod-auth/Yesod/Auth.hs b/yesod-auth/Yesod/Auth.hs +index 86de266..e020c18 100644 +--- a/yesod-auth/Yesod/Auth.hs ++++ b/yesod-auth/Yesod/Auth.hs +@@ -500,10 +500,10 @@ class (YesodAuth master, YesodPersist master) => YesodAuthPersist master where + getAuthEntity :: AuthId master -> HandlerT master IO (Maybe (AuthEntity master)) + + default getAuthEntity +- :: ( YesodPersistBackend master +- ~ PersistEntityBackend (AuthEntity master) +- , Key (AuthEntity master) ~ AuthId master +- , PersistStore (YesodPersistBackend master) ++ :: ( YesodPersistBackend master ~ PersistEntityBackend (AuthEntity master) ++ , BaseBackend (PersistEntityBackend (AuthEntity master)) ~ PersistEntityBackend (AuthEntity master) ++ , PersistStoreRead (PersistEntityBackend (AuthEntity master)) ++ , AuthId master ~ Key (AuthEntity master) + , PersistEntity (AuthEntity master) + ) + => AuthId master -> HandlerT master IO (Maybe (AuthEntity master)) +From e2cc081ac108159f22cc9aa57395ea1960731c5e Mon Sep 17 00:00:00 2001 +From: Erik de Castro Lopo <[email protected]> +Date: Sat, 16 Apr 2016 09:05:47 +1000 +Subject: [PATCH] yesod-auth.cabal: Bump persistent dependency + +--- + yesod-auth/yesod-auth.cabal | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal +index a388396..e774ade 100644 +--- a/yesod-auth/yesod-auth.cabal ++++ b/yesod-auth/yesod-auth.cabal +@@ -37,8 +37,8 @@ library + , unordered-containers + , yesod-form >= 1.4 && < 1.5 + , transformers >= 0.2.2 +- , persistent >= 2.1 && < 2.3 +- , persistent-template >= 2.1 && < 2.2 ++ , persistent >= 2.5 && < 2.6 ++ , persistent-template >= 2.5 && < 2.6 + , http-client + , http-conduit >= 2.1 + , aeson >= 0.7
