[arch-commits] Commit in haskell-yesod-form/repos (8 files)
Felix Yan
fyan at archlinux.org
Mon Apr 18 04:15:28 UTC 2016
Date: Monday, April 18, 2016 @ 06:15:28
Author: fyan
Revision: 171287
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
haskell-yesod-form/repos/community-staging-i686/
haskell-yesod-form/repos/community-staging-i686/PKGBUILD
(from rev 171286, haskell-yesod-form/trunk/PKGBUILD)
haskell-yesod-form/repos/community-staging-i686/haskell-yesod-form.install
(from rev 171286, haskell-yesod-form/trunk/haskell-yesod-form.install)
haskell-yesod-form/repos/community-staging-i686/persistent-2.5.patch
(from rev 171286, haskell-yesod-form/trunk/persistent-2.5.patch)
haskell-yesod-form/repos/community-staging-x86_64/
haskell-yesod-form/repos/community-staging-x86_64/PKGBUILD
(from rev 171286, haskell-yesod-form/trunk/PKGBUILD)
haskell-yesod-form/repos/community-staging-x86_64/haskell-yesod-form.install
(from rev 171286, haskell-yesod-form/trunk/haskell-yesod-form.install)
haskell-yesod-form/repos/community-staging-x86_64/persistent-2.5.patch
(from rev 171286, haskell-yesod-form/trunk/persistent-2.5.patch)
-----------------------------------------------------+
community-staging-i686/PKGBUILD | 55 +++++++++++
community-staging-i686/haskell-yesod-form.install | 18 +++
community-staging-i686/persistent-2.5.patch | 85 ++++++++++++++++++
community-staging-x86_64/PKGBUILD | 55 +++++++++++
community-staging-x86_64/haskell-yesod-form.install | 18 +++
community-staging-x86_64/persistent-2.5.patch | 85 ++++++++++++++++++
6 files changed, 316 insertions(+)
Copied: haskell-yesod-form/repos/community-staging-i686/PKGBUILD (from rev 171286, haskell-yesod-form/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-04-18 04:15:28 UTC (rev 171287)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+_hkgname=yesod-form
+pkgname=haskell-yesod-form
+pkgver=1.4.7
+pkgrel=7
+pkgdesc="Form handling support for Yesod Web Framework"
+url="http://www.yesodweb.com/"
+license=("MIT")
+arch=('i686' 'x86_64')
+depends=("ghc=7.10.3" "haskell-aeson" "haskell-attoparsec" "haskell-blaze-builder"
+ "haskell-blaze-html" "haskell-blaze-markup" "haskell-byteable"
+ "haskell-data-default" "haskell-email-validate" "haskell-network-uri"
+ "haskell-persistent" "haskell-resourcet" "haskell-semigroups"
+ "haskell-shakespeare" "haskell-text" "haskell-wai" "haskell-xss-sanitize"
+ "haskell-yesod-core" "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=('eecbec0755961a4914e8bb41313900ac144e3621fa6c0aa39df19611bf0ebff9'
+ 'e704abb16e8db8cabcc9e793347d35dadc5c1f503b1ecf1211a1b6fa9c8aaed0')
+
+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-form/repos/community-staging-i686/haskell-yesod-form.install (from rev 171286, haskell-yesod-form/trunk/haskell-yesod-form.install)
===================================================================
--- community-staging-i686/haskell-yesod-form.install (rev 0)
+++ community-staging-i686/haskell-yesod-form.install 2016-04-18 04:15:28 UTC (rev 171287)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-yesod-form
+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-form/repos/community-staging-i686/persistent-2.5.patch (from rev 171286, haskell-yesod-form/trunk/persistent-2.5.patch)
===================================================================
--- community-staging-i686/persistent-2.5.patch (rev 0)
+++ community-staging-i686/persistent-2.5.patch 2016-04-18 04:15:28 UTC (rev 171287)
@@ -0,0 +1,85 @@
+From 86bdab06c8598b3735c78104288431eecbd88d72 Mon Sep 17 00:00:00 2001
+From: Erik de Castro Lopo <erikd at mega-nerd.com>
+Date: Mon, 18 Apr 2016 11:31:07 +1000
+Subject: [PATCH] yesod-form: Make it work with persistent 2.5
+
+---
+ yesod-form/Yesod/Form/Fields.hs | 44 ++++++++++++++++++++---------------------
+ 1 file changed, 21 insertions(+), 23 deletions(-)
+
+diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
+index 81daa7c..05051f8 100644
+--- a/yesod-form/Yesod/Form/Fields.hs
++++ b/yesod-form/Yesod/Form/Fields.hs
+@@ -73,7 +73,7 @@ import qualified Text.Email.Validate as Email
+ import Data.Text.Encoding (encodeUtf8, decodeUtf8With)
+ import Data.Text.Encoding.Error (lenientDecode)
+ import Network.URI (parseURI)
+-import Database.Persist.Sql (PersistField, PersistFieldSql (..))
++import Database.Persist.Sql (PersistField, PersistFieldSql (..), PersistQueryRead, BaseBackend)
+ import Database.Persist (Entity (..), SqlType (SqlString))
+ import Text.HTML.SanitizeXSS (sanitizeBalance)
+ import Control.Monad (when, unless)
+@@ -91,7 +91,7 @@ import qualified Data.ByteString.Lazy as L
+ import Data.Text as T ( Text, append, concat, cons, head
+ , intercalate, isPrefixOf, null, unpack, pack, splitOn
+ )
+-import qualified Data.Text as T (drop, dropWhile)
++import qualified Data.Text as T (drop, dropWhile)
+ import qualified Data.Text.Read
+
+ import qualified Data.Map as Map
+@@ -645,16 +645,16 @@ optionsEnum = optionsPairs $ map (\x -> (pack $ show x, x)) [minBound..maxBound]
+ -- > <$> areq (selectField countries) "Which country do you live in?" Nothing
+ -- > where
+ -- > countries = optionsPersist [] [Asc CountryName] countryName
+-optionsPersist :: ( YesodPersist site, PersistEntity a
+- , PersistQuery (PersistEntityBackend a)
+- , PathPiece (Key a)
+- , RenderMessage site msg
+- , YesodPersistBackend site ~ PersistEntityBackend a
+- )
+- => [Filter a]
+- -> [SelectOpt a]
+- -> (a -> msg)
+- -> HandlerT site IO (OptionList (Entity a))
++optionsPersist
++ :: (PersistEntityBackend t ~ BaseBackend (YesodPersistBackend site)
++ , YesodPersist site, PersistEntity t
++ , PersistQueryRead (YesodPersistBackend site)
++ , PathPiece (Key t), RenderMessage site message
++ )
++ => [Filter t]
++ -> [SelectOpt t]
++ -> (t -> message)
++ -> HandlerT site IO (OptionList (Entity t))
+ optionsPersist filts ords toDisplay = fmap mkOptionList $ do
+ mr <- getMessageRender
+ pairs <- runDB $ selectList filts ords
+@@ -669,17 +669,15 @@ optionsPersist filts ords toDisplay = fmap mkOptionList $ do
+ --
+ -- Since 1.3.2
+ optionsPersistKey
+- :: (YesodPersist site
+- , PersistEntity a
+- , PersistQuery (PersistEntityBackend a)
+- , PathPiece (Key a)
+- , RenderMessage site msg
+- , YesodPersistBackend site ~ PersistEntityBackend a
+- )
+- => [Filter a]
+- -> [SelectOpt a]
+- -> (a -> msg)
+- -> HandlerT site IO (OptionList (Key a))
++ :: (PersistEntityBackend t ~ BaseBackend (YesodPersistBackend site)
++ , YesodPersist site, PersistEntity t
++ , PersistQueryRead (YesodPersistBackend site)
++ , PathPiece (Key t), RenderMessage site message
++ )
++ => [Filter t]
++ -> [SelectOpt t]
++ -> (t -> message)
++ -> HandlerT site IO (OptionList (Key t))
+
+ optionsPersistKey filts ords toDisplay = fmap mkOptionList $ do
+ mr <- getMessageRender
Copied: haskell-yesod-form/repos/community-staging-x86_64/PKGBUILD (from rev 171286, haskell-yesod-form/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-04-18 04:15:28 UTC (rev 171287)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+_hkgname=yesod-form
+pkgname=haskell-yesod-form
+pkgver=1.4.7
+pkgrel=7
+pkgdesc="Form handling support for Yesod Web Framework"
+url="http://www.yesodweb.com/"
+license=("MIT")
+arch=('i686' 'x86_64')
+depends=("ghc=7.10.3" "haskell-aeson" "haskell-attoparsec" "haskell-blaze-builder"
+ "haskell-blaze-html" "haskell-blaze-markup" "haskell-byteable"
+ "haskell-data-default" "haskell-email-validate" "haskell-network-uri"
+ "haskell-persistent" "haskell-resourcet" "haskell-semigroups"
+ "haskell-shakespeare" "haskell-text" "haskell-wai" "haskell-xss-sanitize"
+ "haskell-yesod-core" "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=('eecbec0755961a4914e8bb41313900ac144e3621fa6c0aa39df19611bf0ebff9'
+ 'e704abb16e8db8cabcc9e793347d35dadc5c1f503b1ecf1211a1b6fa9c8aaed0')
+
+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-form/repos/community-staging-x86_64/haskell-yesod-form.install (from rev 171286, haskell-yesod-form/trunk/haskell-yesod-form.install)
===================================================================
--- community-staging-x86_64/haskell-yesod-form.install (rev 0)
+++ community-staging-x86_64/haskell-yesod-form.install 2016-04-18 04:15:28 UTC (rev 171287)
@@ -0,0 +1,18 @@
+HS_DIR=usr/share/haskell/haskell-yesod-form
+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-form/repos/community-staging-x86_64/persistent-2.5.patch (from rev 171286, haskell-yesod-form/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 04:15:28 UTC (rev 171287)
@@ -0,0 +1,85 @@
+From 86bdab06c8598b3735c78104288431eecbd88d72 Mon Sep 17 00:00:00 2001
+From: Erik de Castro Lopo <erikd at mega-nerd.com>
+Date: Mon, 18 Apr 2016 11:31:07 +1000
+Subject: [PATCH] yesod-form: Make it work with persistent 2.5
+
+---
+ yesod-form/Yesod/Form/Fields.hs | 44 ++++++++++++++++++++---------------------
+ 1 file changed, 21 insertions(+), 23 deletions(-)
+
+diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs
+index 81daa7c..05051f8 100644
+--- a/yesod-form/Yesod/Form/Fields.hs
++++ b/yesod-form/Yesod/Form/Fields.hs
+@@ -73,7 +73,7 @@ import qualified Text.Email.Validate as Email
+ import Data.Text.Encoding (encodeUtf8, decodeUtf8With)
+ import Data.Text.Encoding.Error (lenientDecode)
+ import Network.URI (parseURI)
+-import Database.Persist.Sql (PersistField, PersistFieldSql (..))
++import Database.Persist.Sql (PersistField, PersistFieldSql (..), PersistQueryRead, BaseBackend)
+ import Database.Persist (Entity (..), SqlType (SqlString))
+ import Text.HTML.SanitizeXSS (sanitizeBalance)
+ import Control.Monad (when, unless)
+@@ -91,7 +91,7 @@ import qualified Data.ByteString.Lazy as L
+ import Data.Text as T ( Text, append, concat, cons, head
+ , intercalate, isPrefixOf, null, unpack, pack, splitOn
+ )
+-import qualified Data.Text as T (drop, dropWhile)
++import qualified Data.Text as T (drop, dropWhile)
+ import qualified Data.Text.Read
+
+ import qualified Data.Map as Map
+@@ -645,16 +645,16 @@ optionsEnum = optionsPairs $ map (\x -> (pack $ show x, x)) [minBound..maxBound]
+ -- > <$> areq (selectField countries) "Which country do you live in?" Nothing
+ -- > where
+ -- > countries = optionsPersist [] [Asc CountryName] countryName
+-optionsPersist :: ( YesodPersist site, PersistEntity a
+- , PersistQuery (PersistEntityBackend a)
+- , PathPiece (Key a)
+- , RenderMessage site msg
+- , YesodPersistBackend site ~ PersistEntityBackend a
+- )
+- => [Filter a]
+- -> [SelectOpt a]
+- -> (a -> msg)
+- -> HandlerT site IO (OptionList (Entity a))
++optionsPersist
++ :: (PersistEntityBackend t ~ BaseBackend (YesodPersistBackend site)
++ , YesodPersist site, PersistEntity t
++ , PersistQueryRead (YesodPersistBackend site)
++ , PathPiece (Key t), RenderMessage site message
++ )
++ => [Filter t]
++ -> [SelectOpt t]
++ -> (t -> message)
++ -> HandlerT site IO (OptionList (Entity t))
+ optionsPersist filts ords toDisplay = fmap mkOptionList $ do
+ mr <- getMessageRender
+ pairs <- runDB $ selectList filts ords
+@@ -669,17 +669,15 @@ optionsPersist filts ords toDisplay = fmap mkOptionList $ do
+ --
+ -- Since 1.3.2
+ optionsPersistKey
+- :: (YesodPersist site
+- , PersistEntity a
+- , PersistQuery (PersistEntityBackend a)
+- , PathPiece (Key a)
+- , RenderMessage site msg
+- , YesodPersistBackend site ~ PersistEntityBackend a
+- )
+- => [Filter a]
+- -> [SelectOpt a]
+- -> (a -> msg)
+- -> HandlerT site IO (OptionList (Key a))
++ :: (PersistEntityBackend t ~ BaseBackend (YesodPersistBackend site)
++ , YesodPersist site, PersistEntity t
++ , PersistQueryRead (YesodPersistBackend site)
++ , PathPiece (Key t), RenderMessage site message
++ )
++ => [Filter t]
++ -> [SelectOpt t]
++ -> (t -> message)
++ -> HandlerT site IO (OptionList (Key t))
+
+ optionsPersistKey filts ords toDisplay = fmap mkOptionList $ do
+ mr <- getMessageRender
More information about the arch-commits
mailing list