Date: Friday, April 29, 2016 @ 07:36:53
Author: fyan
Revision: 172601
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
haskell-yesod-persistent/repos/community-staging-i686/PKGBUILD
(from rev 172600, haskell-yesod-persistent/trunk/PKGBUILD)
haskell-yesod-persistent/repos/community-staging-i686/haskell-yesod-persistent.install
(from rev 172600,
haskell-yesod-persistent/trunk/haskell-yesod-persistent.install)
haskell-yesod-persistent/repos/community-staging-x86_64/PKGBUILD
(from rev 172600, haskell-yesod-persistent/trunk/PKGBUILD)
haskell-yesod-persistent/repos/community-staging-x86_64/haskell-yesod-persistent.install
(from rev 172600,
haskell-yesod-persistent/trunk/haskell-yesod-persistent.install)
Deleted:
haskell-yesod-persistent/repos/community-staging-i686/PKGBUILD
haskell-yesod-persistent/repos/community-staging-i686/haskell-yesod-persistent.install
haskell-yesod-persistent/repos/community-staging-i686/persistent-2.5.patch
haskell-yesod-persistent/repos/community-staging-x86_64/PKGBUILD
haskell-yesod-persistent/repos/community-staging-x86_64/haskell-yesod-persistent.install
haskell-yesod-persistent/repos/community-staging-x86_64/persistent-2.5.patch
-----------------------------------------------------------+
/PKGBUILD | 88 ++++++++++++
/haskell-yesod-persistent.install | 36 ++++
community-staging-i686/PKGBUILD | 51 ------
community-staging-i686/haskell-yesod-persistent.install | 18 --
community-staging-i686/persistent-2.5.patch | 55 -------
community-staging-x86_64/PKGBUILD | 51 ------
community-staging-x86_64/haskell-yesod-persistent.install | 18 --
community-staging-x86_64/persistent-2.5.patch | 55 -------
8 files changed, 124 insertions(+), 248 deletions(-)
Deleted: community-staging-i686/PKGBUILD
===================================================================
--- community-staging-i686/PKGBUILD 2016-04-29 05:36:22 UTC (rev 172600)
+++ community-staging-i686/PKGBUILD 2016-04-29 05:36:53 UTC (rev 172601)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Arch Haskell Team <arch-hask...@haskell.org>
-
-_hkgname=yesod-persistent
-pkgname=haskell-yesod-persistent
-pkgver=1.4.0.4
-pkgrel=7
-pkgdesc="Some helpers for using Persistent from Yesod."
-url="http://www.yesodweb.com/";
-license=("MIT")
-arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" "haskell-blaze-builder" "haskell-conduit"
"haskell-persistent"
- "haskell-persistent-template" "haskell-resource-pool"
"haskell-resourcet"
- "haskell-yesod-core")
-options=('staticlibs')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz";
- persistent-2.5.patch)
-install="${pkgname}.install"
-sha256sums=('840dac8758176dd2b27bbff49a8cdd724b6f99cdf1b723a1eae5d2a18898d25d'
- '72d45f93507459dd2d5742ba5727e337affe45eaf097c318c94f1d1f5b75e831')
-
-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
- runhaskell Setup build
- 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-persistent/repos/community-staging-i686/PKGBUILD (from
rev 172600, haskell-yesod-persistent/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-04-29 05:36:53 UTC (rev 172601)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Arch Haskell Team <arch-hask...@haskell.org>
+
+_hkgname=yesod-persistent
+pkgname=haskell-yesod-persistent
+pkgver=1.4.0.5
+pkgrel=1
+pkgdesc="Some helpers for using Persistent from Yesod."
+url="http://www.yesodweb.com/";
+license=("MIT")
+arch=('i686' 'x86_64')
+depends=("ghc=7.10.3" "haskell-blaze-builder" "haskell-conduit"
"haskell-persistent"
+ "haskell-persistent-template" "haskell-resource-pool"
"haskell-resourcet"
+ "haskell-yesod-core")
+options=('staticlibs')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz";)
+install="${pkgname}.install"
+sha256sums=('e5ad890ca4d4c0499ae08e5e1e294f4c1435e9395ba1ba9bb3acf3982eb8d2c2')
+
+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
+ runhaskell Setup build
+ 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"
+}
Deleted: community-staging-i686/haskell-yesod-persistent.install
===================================================================
--- community-staging-i686/haskell-yesod-persistent.install 2016-04-29
05:36:22 UTC (rev 172600)
+++ community-staging-i686/haskell-yesod-persistent.install 2016-04-29
05:36:53 UTC (rev 172601)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-yesod-persistent
-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-persistent/repos/community-staging-i686/haskell-yesod-persistent.install
(from rev 172600,
haskell-yesod-persistent/trunk/haskell-yesod-persistent.install)
===================================================================
--- community-staging-i686/haskell-yesod-persistent.install
(rev 0)
+++ community-staging-i686/haskell-yesod-persistent.install 2016-04-29
05:36:53 UTC (rev 172601)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-yesod-persistent
+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)
+}
Deleted: community-staging-i686/persistent-2.5.patch
===================================================================
--- community-staging-i686/persistent-2.5.patch 2016-04-29 05:36:22 UTC (rev
172600)
+++ community-staging-i686/persistent-2.5.patch 2016-04-29 05:36:53 UTC (rev
172601)
@@ -1,55 +0,0 @@
-From 7e7cba8fc60db30789d75182cbc6cad1bdbb6f44 Mon Sep 17 00:00:00 2001
-From: Erik de Castro Lopo <er...@mega-nerd.com>
-Date: Fri, 15 Apr 2016 14:41:55 +1000
-Subject: [PATCH] yesod-persistent: Make it work with persistent 2.5
-
----
- yesod-persistent/Yesod/Persist/Core.hs | 12 ++++++------
- yesod-persistent/yesod-persistent.cabal | 4 ++--
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/yesod-persistent/Yesod/Persist/Core.hs
b/yesod-persistent/Yesod/Persist/Core.hs
-index c566707..1a4f51d 100644
---- a/yesod-persistent/Yesod/Persist/Core.hs
-+++ b/yesod-persistent/Yesod/Persist/Core.hs
-@@ -124,9 +124,9 @@ respondSourceDB :: YesodPersistRunner site
- respondSourceDB ctype = respondSource ctype . runDBSource
-
- -- | Get the given entity by ID, or return a 404 not found if it doesn't
exist.
--get404 :: (MonadIO m, PersistStore (PersistEntityBackend val), PersistEntity
val)
-- => Key val
-- -> ReaderT (PersistEntityBackend val) m val
-+get404 :: (PersistEntityBackend val ~ BaseBackend backend, MonadIO m
-+ , PersistEntity val, PersistStoreRead backend)
-+ => Key val -> ReaderT backend m val
- get404 key = do
- mres <- get key
- case mres of
-@@ -135,9 +135,9 @@ get404 key = do
-
- -- | Get the given entity by unique key, or return a 404 not found if it
doesn't
- -- exist.
--getBy404 :: (PersistUnique (PersistEntityBackend val), PersistEntity val,
MonadIO m)
-- => Unique val
-- -> ReaderT (PersistEntityBackend val) m (Entity val)
-+getBy404 :: (PersistEntityBackend val ~ BaseBackend backend, MonadIO m
-+ , PersistEntity val, PersistUniqueRead backend)
-+ => Unique val -> ReaderT backend m (Entity val)
- getBy404 key = do
- mres <- getBy key
- case mres of
-diff --git a/yesod-persistent/yesod-persistent.cabal
b/yesod-persistent/yesod-persistent.cabal
-index a12ca07..b056555 100644
---- a/yesod-persistent/yesod-persistent.cabal
-+++ b/yesod-persistent/yesod-persistent.cabal
-@@ -16,8 +16,8 @@ extra-source-files: README.md ChangeLog.md
- library
- build-depends: base >= 4 && < 5
- , yesod-core >= 1.4.0 && < 1.5
-- , persistent >= 2.1 && < 2.3
-- , persistent-template >= 2.1 && < 2.2
-+ , persistent >= 2.5 && < 2.6
-+ , persistent-template >= 2.5 && < 2.6
- , transformers >= 0.2.2
- , blaze-builder
- , conduit
Deleted: community-staging-x86_64/PKGBUILD
===================================================================
--- community-staging-x86_64/PKGBUILD 2016-04-29 05:36:22 UTC (rev 172600)
+++ community-staging-x86_64/PKGBUILD 2016-04-29 05:36:53 UTC (rev 172601)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonm...@archlinux.org>
-# Contributor: Arch Haskell Team <arch-hask...@haskell.org>
-
-_hkgname=yesod-persistent
-pkgname=haskell-yesod-persistent
-pkgver=1.4.0.4
-pkgrel=7
-pkgdesc="Some helpers for using Persistent from Yesod."
-url="http://www.yesodweb.com/";
-license=("MIT")
-arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" "haskell-blaze-builder" "haskell-conduit"
"haskell-persistent"
- "haskell-persistent-template" "haskell-resource-pool"
"haskell-resourcet"
- "haskell-yesod-core")
-options=('staticlibs')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz";
- persistent-2.5.patch)
-install="${pkgname}.install"
-sha256sums=('840dac8758176dd2b27bbff49a8cdd724b6f99cdf1b723a1eae5d2a18898d25d'
- '72d45f93507459dd2d5742ba5727e337affe45eaf097c318c94f1d1f5b75e831')
-
-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
- runhaskell Setup build
- 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-persistent/repos/community-staging-x86_64/PKGBUILD (from
rev 172600, haskell-yesod-persistent/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-04-29 05:36:53 UTC (rev 172601)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonm...@archlinux.org>
+# Contributor: Arch Haskell Team <arch-hask...@haskell.org>
+
+_hkgname=yesod-persistent
+pkgname=haskell-yesod-persistent
+pkgver=1.4.0.5
+pkgrel=1
+pkgdesc="Some helpers for using Persistent from Yesod."
+url="http://www.yesodweb.com/";
+license=("MIT")
+arch=('i686' 'x86_64')
+depends=("ghc=7.10.3" "haskell-blaze-builder" "haskell-conduit"
"haskell-persistent"
+ "haskell-persistent-template" "haskell-resource-pool"
"haskell-resourcet"
+ "haskell-yesod-core")
+options=('staticlibs')
+source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz";)
+install="${pkgname}.install"
+sha256sums=('e5ad890ca4d4c0499ae08e5e1e294f4c1435e9395ba1ba9bb3acf3982eb8d2c2')
+
+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
+ runhaskell Setup build
+ 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"
+}
Deleted: community-staging-x86_64/haskell-yesod-persistent.install
===================================================================
--- community-staging-x86_64/haskell-yesod-persistent.install 2016-04-29
05:36:22 UTC (rev 172600)
+++ community-staging-x86_64/haskell-yesod-persistent.install 2016-04-29
05:36:53 UTC (rev 172601)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-yesod-persistent
-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-persistent/repos/community-staging-x86_64/haskell-yesod-persistent.install
(from rev 172600,
haskell-yesod-persistent/trunk/haskell-yesod-persistent.install)
===================================================================
--- community-staging-x86_64/haskell-yesod-persistent.install
(rev 0)
+++ community-staging-x86_64/haskell-yesod-persistent.install 2016-04-29
05:36:53 UTC (rev 172601)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-yesod-persistent
+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)
+}
Deleted: community-staging-x86_64/persistent-2.5.patch
===================================================================
--- community-staging-x86_64/persistent-2.5.patch 2016-04-29 05:36:22 UTC
(rev 172600)
+++ community-staging-x86_64/persistent-2.5.patch 2016-04-29 05:36:53 UTC
(rev 172601)
@@ -1,55 +0,0 @@
-From 7e7cba8fc60db30789d75182cbc6cad1bdbb6f44 Mon Sep 17 00:00:00 2001
-From: Erik de Castro Lopo <er...@mega-nerd.com>
-Date: Fri, 15 Apr 2016 14:41:55 +1000
-Subject: [PATCH] yesod-persistent: Make it work with persistent 2.5
-
----
- yesod-persistent/Yesod/Persist/Core.hs | 12 ++++++------
- yesod-persistent/yesod-persistent.cabal | 4 ++--
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/yesod-persistent/Yesod/Persist/Core.hs
b/yesod-persistent/Yesod/Persist/Core.hs
-index c566707..1a4f51d 100644
---- a/yesod-persistent/Yesod/Persist/Core.hs
-+++ b/yesod-persistent/Yesod/Persist/Core.hs
-@@ -124,9 +124,9 @@ respondSourceDB :: YesodPersistRunner site
- respondSourceDB ctype = respondSource ctype . runDBSource
-
- -- | Get the given entity by ID, or return a 404 not found if it doesn't
exist.
--get404 :: (MonadIO m, PersistStore (PersistEntityBackend val), PersistEntity
val)
-- => Key val
-- -> ReaderT (PersistEntityBackend val) m val
-+get404 :: (PersistEntityBackend val ~ BaseBackend backend, MonadIO m
-+ , PersistEntity val, PersistStoreRead backend)
-+ => Key val -> ReaderT backend m val
- get404 key = do
- mres <- get key
- case mres of
-@@ -135,9 +135,9 @@ get404 key = do
-
- -- | Get the given entity by unique key, or return a 404 not found if it
doesn't
- -- exist.
--getBy404 :: (PersistUnique (PersistEntityBackend val), PersistEntity val,
MonadIO m)
-- => Unique val
-- -> ReaderT (PersistEntityBackend val) m (Entity val)
-+getBy404 :: (PersistEntityBackend val ~ BaseBackend backend, MonadIO m
-+ , PersistEntity val, PersistUniqueRead backend)
-+ => Unique val -> ReaderT backend m (Entity val)
- getBy404 key = do
- mres <- getBy key
- case mres of
-diff --git a/yesod-persistent/yesod-persistent.cabal
b/yesod-persistent/yesod-persistent.cabal
-index a12ca07..b056555 100644
---- a/yesod-persistent/yesod-persistent.cabal
-+++ b/yesod-persistent/yesod-persistent.cabal
-@@ -16,8 +16,8 @@ extra-source-files: README.md ChangeLog.md
- library
- build-depends: base >= 4 && < 5
- , yesod-core >= 1.4.0 && < 1.5
-- , persistent >= 2.1 && < 2.3
-- , persistent-template >= 2.1 && < 2.2
-+ , persistent >= 2.5 && < 2.6
-+ , persistent-template >= 2.5 && < 2.6
- , transformers >= 0.2.2
- , blaze-builder
- , conduit
