Date: Friday, April 29, 2016 @ 08:06:15 Author: fyan Revision: 172624
upgpkg: haskell-yesod-form 1.4.7.1-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-form/trunk/PKGBUILD Deleted: haskell-yesod-form/trunk/persistent-2.5.patch ----------------------+ PKGBUILD | 15 ++------ persistent-2.5.patch | 85 ------------------------------------------------- 2 files changed, 4 insertions(+), 96 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-04-29 06:00:26 UTC (rev 172623) +++ PKGBUILD 2016-04-29 06:06:15 UTC (rev 172624) @@ -4,8 +4,8 @@ _hkgname=yesod-form pkgname=haskell-yesod-form -pkgver=1.4.7 -pkgrel=7 +pkgver=1.4.7.1 +pkgrel=1 pkgdesc="Form handling support for Yesod Web Framework" url="http://www.yesodweb.com/"; license=("MIT") @@ -17,17 +17,10 @@ "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) +source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz";) install="${pkgname}.install" -sha256sums=('eecbec0755961a4914e8bb41313900ac144e3621fa6c0aa39df19611bf0ebff9' - 'e704abb16e8db8cabcc9e793347d35dadc5c1f503b1ecf1211a1b6fa9c8aaed0') +sha256sums=('66f1672c7aaec0b4c93f5cfc20593a4fb92d779d90d55ee5ebd1f7ae6a6e8dac') -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 06:00:26 UTC (rev 172623) +++ persistent-2.5.patch 2016-04-29 06:06:15 UTC (rev 172624) @@ -1,85 +0,0 @@ -From 86bdab06c8598b3735c78104288431eecbd88d72 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo <[email protected]> -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
