[arch-commits] Commit in haskell-yesod-auth/trunk (PKGBUILD persistent-2.5.patch)

[Felix Yan]

    Date: Friday, April 29, 2016 @ 10:31:07
  Author: fyan
Revision: 172664

upgpkg: haskell-yesod-auth 1.4.13.2-1

rebuild with yaml-0.8.17.1, http-client-0.4.28, http-client-tls-0.2.4, http-conduit-2.1.10, wai-3.2.1, MonadRandom-0.4.2.3, attoparsec-0.13.0.2, auto-update-0.1.3.1, blaze-builder-0.4.0.2, cheapskate-0.1.0.5, clock-0.7.2, contravariant-extras-0.3.2, cookie-0.4.2, data-default-0.6.0, data-default-instances-base-0.1.0, fast-logger-2.4.6, file-embed 0.0.9.1 -> 0.0.10, geniplate-mirror-0.7.4, hakyll-4.8.1.0, math-functions-0.1.6.0, mime-types-0.1.0.7, psqueues-0.2.2.1, regex-tdfa-1.2.2, shake-0.15.6, shakespeare-2.0.8.2, streaming-commons-0.1.15.4, tagged-0.8.4, texmath-0.8.6.2, vector-binary-instances-0.2.3.2, vector-th-unbox-0.2.1.6, wai-extra-3.0.15.1, wai-logger-2.2.7, xml-conduit-1.3.4.2, xss-sanitize-0.3.5.7, yesod-auth-1.4.13.2, yesod-core-1.4.20.2, yesod-form-1.4.7.1, yesod-persistent-1.4.0.5

Modified:
  haskell-yesod-auth/trunk/PKGBUILD
Deleted:
  haskell-yesod-auth/trunk/persistent-2.5.patch

----------------------+
 PKGBUILD             |   15 +++-----------
 persistent-2.5.patch |   52 -------------------------------------------------
 2 files changed, 4 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-29 07:15:47 UTC (rev 172663)
+++ PKGBUILD	2016-04-29 08:31:07 UTC (rev 172664)
@@ -4,8 +4,8 @@
 
 _hkgname=yesod-auth
 pkgname=haskell-yesod-auth
-pkgver=1.4.13.1
-pkgrel=4
+pkgver=1.4.13.2
+pkgrel=1
 pkgdesc="Authentication for Yesod."
 url="http://www.yesodweb.com/"
 license=("MIT")
@@ -21,17 +21,10 @@
          "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"
-        persistent-2.5.patch)
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install="${pkgname}.install"
-sha256sums=('cb1ff6df7624c2b46f404e02b6ee0e3dc218c8a73196dbb824e7bb0e18a88852'
-            '1c89987092728c606c0f37b2e0cab5c0678741be2d2962670def0f23b6d310ee')
+sha256sums=('65d4cdc979db56e766aef3f64183075f4976ddedb8e62b07efb09be56f2cca20')
 
-prepare() {
-    cd "${srcdir}/${_hkgname}-${pkgver}"
-    patch -p2 -i ../persistent-2.5.patch
-}
-
 build() {
     cd "${srcdir}/${_hkgname}-${pkgver}"
     

Deleted: persistent-2.5.patch
===================================================================
--- persistent-2.5.patch	2016-04-29 07:15:47 UTC (rev 172663)
+++ persistent-2.5.patch	2016-04-29 08:31:07 UTC (rev 172664)
@@ -1,52 +0,0 @@
-From e95fa133303026833c2606dc8270ed0d79bd58bf Mon Sep 17 00:00:00 2001
-From: Erik de Castro Lopo <erikd at mega-nerd.com>
-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 <erikd at mega-nerd.com>
-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