[arch-commits] Commit in haskell-yesod-auth/repos (8 files)
Felix Yan
fyan at archlinux.org
Mon Apr 18 05:32:30 UTC 2016
Date: Monday, April 18, 2016 @ 07:32:29
Author: fyan
Revision: 171295
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
haskell-yesod-auth/repos/community-staging-i686/
haskell-yesod-auth/repos/community-staging-i686/PKGBUILD
(from rev 171294, haskell-yesod-auth/trunk/PKGBUILD)
haskell-yesod-auth/repos/community-staging-i686/haskell-yesod-auth.install
(from rev 171294, haskell-yesod-auth/trunk/haskell-yesod-auth.install)
haskell-yesod-auth/repos/community-staging-i686/persistent-2.5.patch
(from rev 171294, haskell-yesod-auth/trunk/persistent-2.5.patch)
haskell-yesod-auth/repos/community-staging-x86_64/
haskell-yesod-auth/repos/community-staging-x86_64/PKGBUILD
(from rev 171294, haskell-yesod-auth/trunk/PKGBUILD)
haskell-yesod-auth/repos/community-staging-x86_64/haskell-yesod-auth.install
(from rev 171294, haskell-yesod-auth/trunk/haskell-yesod-auth.install)
haskell-yesod-auth/repos/community-staging-x86_64/persistent-2.5.patch
(from rev 171294, haskell-yesod-auth/trunk/persistent-2.5.patch)
-----------------------------------------------------+
community-staging-i686/PKGBUILD | 59 ++++++++++++++++++
community-staging-i686/haskell-yesod-auth.install | 18 +++++
community-staging-i686/persistent-2.5.patch | 52 +++++++++++++++
community-staging-x86_64/PKGBUILD | 59 ++++++++++++++++++
community-staging-x86_64/haskell-yesod-auth.install | 18 +++++
community-staging-x86_64/persistent-2.5.patch | 52 +++++++++++++++
6 files changed, 258 insertions(+)
Copied: haskell-yesod-auth/repos/community-staging-i686/PKGBUILD (from rev 171294, haskell-yesod-auth/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-04-18 05:32:29 UTC (rev 171295)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+_hkgname=yesod-auth
+pkgname=haskell-yesod-auth
+pkgver=1.4.13.1
+pkgrel=4
+pkgdesc="Authentication for Yesod."
+url="http://www.yesodweb.com/"
+license=("MIT")
+arch=('i686' 'x86_64')
+depends=("ghc=7.10.3" "haskell-aeson" "haskell-authenticate" "haskell-base16-bytestring"
+ "haskell-base64-bytestring" "haskell-blaze-builder" "haskell-blaze-html"
+ "haskell-blaze-markup" "haskell-byteable" "haskell-conduit" "haskell-conduit-extra"
+ "haskell-cryptohash" "haskell-data-default" "haskell-email-validate"
+ "haskell-file-embed" "haskell-http-client" "haskell-http-conduit"
+ "haskell-http-types" "haskell-lifted-base" "haskell-mime-mail" "haskell-network-uri"
+ "haskell-nonce" "haskell-persistent" "haskell-persistent-template" "haskell-random"
+ "haskell-resourcet" "haskell-safe" "haskell-shakespeare" "haskell-text"
+ "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)
+install="${pkgname}.install"
+sha256sums=('cb1ff6df7624c2b46f404e02b6ee0e3dc218c8a73196dbb824e7bb0e18a88852'
+ '1c89987092728c606c0f37b2e0cab5c0678741be2d2962670def0f23b6d310ee')
+
+prepare() {
+ cd "${srcdir}/${_hkgname}-${pkgver}"
+ patch -p2 -i ../persistent-2.5.patch
+}
+
+build() {
+ cd "${srcdir}/${_hkgname}-${pkgver}"
+
+ runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+ --libsubdir=\$compiler/site-local/\$pkgid \
+ -fnetwork-uri
+ runhaskell Setup build
+ LC_CTYPE=en_US.UTF-8 runhaskell Setup haddock --hoogle --html
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+ cd "${srcdir}/${_hkgname}-${pkgver}"
+
+ install -D -m744 register.sh "${pkgdir}/usr/share/haskell/${pkgname}/register.sh"
+ install -m744 unregister.sh "${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh"
+ install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
+ ln -s "/usr/share/doc/${pkgname}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}
Copied: haskell-yesod-auth/repos/community-staging-i686/haskell-yesod-auth.install (from rev 171294, haskell-yesod-auth/trunk/haskell-yesod-auth.install)
===================================================================
--- community-staging-i686/haskell-yesod-auth.install (rev 0)
+++ community-staging-i686/haskell-yesod-auth.install 2016-04-18 05:32:29 UTC (rev 171295)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-yesod-auth
+post_install() {
+ ${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+ ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+ ${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+ ${HS_DIR}/unregister.sh
+}
+post_remove() {
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
Copied: haskell-yesod-auth/repos/community-staging-i686/persistent-2.5.patch (from rev 171294, haskell-yesod-auth/trunk/persistent-2.5.patch)
===================================================================
--- community-staging-i686/persistent-2.5.patch (rev 0)
+++ community-staging-i686/persistent-2.5.patch 2016-04-18 05:32:29 UTC (rev 171295)
@@ -0,0 +1,52 @@
+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
Copied: haskell-yesod-auth/repos/community-staging-x86_64/PKGBUILD (from rev 171294, haskell-yesod-auth/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-04-18 05:32:29 UTC (rev 171295)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+_hkgname=yesod-auth
+pkgname=haskell-yesod-auth
+pkgver=1.4.13.1
+pkgrel=4
+pkgdesc="Authentication for Yesod."
+url="http://www.yesodweb.com/"
+license=("MIT")
+arch=('i686' 'x86_64')
+depends=("ghc=7.10.3" "haskell-aeson" "haskell-authenticate" "haskell-base16-bytestring"
+ "haskell-base64-bytestring" "haskell-blaze-builder" "haskell-blaze-html"
+ "haskell-blaze-markup" "haskell-byteable" "haskell-conduit" "haskell-conduit-extra"
+ "haskell-cryptohash" "haskell-data-default" "haskell-email-validate"
+ "haskell-file-embed" "haskell-http-client" "haskell-http-conduit"
+ "haskell-http-types" "haskell-lifted-base" "haskell-mime-mail" "haskell-network-uri"
+ "haskell-nonce" "haskell-persistent" "haskell-persistent-template" "haskell-random"
+ "haskell-resourcet" "haskell-safe" "haskell-shakespeare" "haskell-text"
+ "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)
+install="${pkgname}.install"
+sha256sums=('cb1ff6df7624c2b46f404e02b6ee0e3dc218c8a73196dbb824e7bb0e18a88852'
+ '1c89987092728c606c0f37b2e0cab5c0678741be2d2962670def0f23b6d310ee')
+
+prepare() {
+ cd "${srcdir}/${_hkgname}-${pkgver}"
+ patch -p2 -i ../persistent-2.5.patch
+}
+
+build() {
+ cd "${srcdir}/${_hkgname}-${pkgver}"
+
+ runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+ --libsubdir=\$compiler/site-local/\$pkgid \
+ -fnetwork-uri
+ runhaskell Setup build
+ LC_CTYPE=en_US.UTF-8 runhaskell Setup haddock --hoogle --html
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package() {
+ cd "${srcdir}/${_hkgname}-${pkgver}"
+
+ install -D -m744 register.sh "${pkgdir}/usr/share/haskell/${pkgname}/register.sh"
+ install -m744 unregister.sh "${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh"
+ install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
+ ln -s "/usr/share/doc/${pkgname}/html" "${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}
Copied: haskell-yesod-auth/repos/community-staging-x86_64/haskell-yesod-auth.install (from rev 171294, haskell-yesod-auth/trunk/haskell-yesod-auth.install)
===================================================================
--- community-staging-x86_64/haskell-yesod-auth.install (rev 0)
+++ community-staging-x86_64/haskell-yesod-auth.install 2016-04-18 05:32:29 UTC (rev 171295)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-yesod-auth
+post_install() {
+ ${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_upgrade() {
+ ${HS_DIR}/unregister.sh
+}
+post_upgrade() {
+ ${HS_DIR}/register.sh
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
+pre_remove() {
+ ${HS_DIR}/unregister.sh
+}
+post_remove() {
+ (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
+}
Copied: haskell-yesod-auth/repos/community-staging-x86_64/persistent-2.5.patch (from rev 171294, haskell-yesod-auth/trunk/persistent-2.5.patch)
===================================================================
--- community-staging-x86_64/persistent-2.5.patch (rev 0)
+++ community-staging-x86_64/persistent-2.5.patch 2016-04-18 05:32:29 UTC (rev 171295)
@@ -0,0 +1,52 @@
+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
More information about the arch-commits
mailing list