[arch-commits] Commit in haskell-shakespeare/repos (6 files)
Felix Yan
felixonmars at archlinux.org
Wed Dec 28 02:54:40 UTC 2016
Date: Wednesday, December 28, 2016 @ 02:54:39
Author: felixonmars
Revision: 203134
archrelease: copy trunk to community-i686, community-x86_64
Added:
haskell-shakespeare/repos/community-i686/PKGBUILD
(from rev 203133, haskell-shakespeare/trunk/PKGBUILD)
haskell-shakespeare/repos/community-i686/issue201.patch
(from rev 203133, haskell-shakespeare/trunk/issue201.patch)
haskell-shakespeare/repos/community-x86_64/PKGBUILD
(from rev 203133, haskell-shakespeare/trunk/PKGBUILD)
haskell-shakespeare/repos/community-x86_64/issue201.patch
(from rev 203133, haskell-shakespeare/trunk/issue201.patch)
Deleted:
haskell-shakespeare/repos/community-i686/PKGBUILD
haskell-shakespeare/repos/community-x86_64/PKGBUILD
---------------------------------+
/PKGBUILD | 106 ++++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 53 -------------------
community-i686/issue201.patch | 47 ++++++++++++++++
community-x86_64/PKGBUILD | 53 -------------------
community-x86_64/issue201.patch | 47 ++++++++++++++++
5 files changed, 200 insertions(+), 106 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-12-28 02:49:32 UTC (rev 203133)
+++ community-i686/PKGBUILD 2016-12-28 02:54:39 UTC (rev 203134)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-
-_hkgname=shakespeare
-pkgname=haskell-shakespeare
-pkgver=2.0.12
-pkgrel=2
-pkgdesc="A toolkit for making compile-time interpolated templates"
-url="http://www.yesodweb.com/book/shakespearean-templates"
-license=("MIT")
-arch=('i686' 'x86_64')
-depends=("ghc=8.0.1" "haskell-aeson" "haskell-blaze-html" "haskell-blaze-markup"
- "haskell-exceptions" "haskell-parsec" "haskell-scientific" "haskell-text"
- "haskell-unordered-containers" "haskell-vector")
-source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
- issue201.patch)
-sha256sums=('9f07d26f00bba94ea47c35197132d22d8f6cb56de53bad818c5db8382c7cae91'
- '7f5fdcd7afe63168df07ad59c4c191c76b341e811d1952b4da089763a165c6ff')
-
-prepare() {
- cd "${srcdir}/${_hkgname}-${pkgver}"
- # https://github.com/yesodweb/shakespeare/pull/201
- patch -p1 -i ../issue201.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 \
- -f-test_roy -f-test_coffee -f-test_export
- 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.*update[^ ]* |&'--force' |" register.sh
- 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/register/${pkgname}.sh"
- install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.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-shakespeare/repos/community-i686/PKGBUILD (from rev 203133, haskell-shakespeare/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-12-28 02:54:39 UTC (rev 203134)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+_hkgname=shakespeare
+pkgname=haskell-shakespeare
+pkgver=2.0.12
+pkgrel=3
+pkgdesc="A toolkit for making compile-time interpolated templates"
+url="http://www.yesodweb.com/book/shakespearean-templates"
+license=("MIT")
+arch=('i686' 'x86_64')
+depends=("ghc=8.0.1" "haskell-aeson" "haskell-blaze-html" "haskell-blaze-markup"
+ "haskell-exceptions" "haskell-parsec" "haskell-scientific" "haskell-text"
+ "haskell-unordered-containers" "haskell-vector")
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+ issue201.patch)
+sha256sums=('9f07d26f00bba94ea47c35197132d22d8f6cb56de53bad818c5db8382c7cae91'
+ '01d6550508d2651cf5d7fdceaa929a6749ab1340977dbf3a0462325eb5a317c3')
+
+prepare() {
+ cd "${srcdir}/${_hkgname}-${pkgver}"
+ # https://github.com/yesodweb/shakespeare/pull/201
+ patch -p1 -i ../issue201.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 \
+ -f-test_roy -f-test_coffee -f-test_export
+ 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.*update[^ ]* |&'--force' |" register.sh
+ 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/register/${pkgname}.sh"
+ install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.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-shakespeare/repos/community-i686/issue201.patch (from rev 203133, haskell-shakespeare/trunk/issue201.patch)
===================================================================
--- community-i686/issue201.patch (rev 0)
+++ community-i686/issue201.patch 2016-12-28 02:54:39 UTC (rev 203134)
@@ -0,0 +1,47 @@
+From 81875f9409cb306ec518d61812a6f3f075e16339 Mon Sep 17 00:00:00 2001
+From: Tyler Erickson <me at tylererickson.com>
+Date: Tue, 27 Dec 2016 12:09:46 -0800
+Subject: [PATCH] Fixed regression caused by previous merge
+
+---
+ Text/Hamlet/Parse.hs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Text/Hamlet/Parse.hs b/Text/Hamlet/Parse.hs
+index d0c9961..27b65a7 100644
+--- a/Text/Hamlet/Parse.hs
++++ b/Text/Hamlet/Parse.hs
+@@ -257,6 +257,7 @@ parseLine set = do
+ case x of
+ Left "#" -> case cr of
+ InContent -> return (ContentRaw "#", False)
++ NotInQuotesAttr -> return (ContentRaw "#", False)
+ _ -> fail "Expected hash at end of line, got Id"
+ Left str -> return (ContentRaw str, null str)
+ Right deref -> return (ContentVar deref, False)
+From b43ceba3f033e1aa83c3c424a661996a3e272194 Mon Sep 17 00:00:00 2001
+From: Tyler Erickson <me at tylererickson.com>
+Date: Tue, 27 Dec 2016 12:22:44 -0800
+Subject: [PATCH] Reversed Test cases; NotInQuotes -> fail; otherwise ->
+ succeed
+
+---
+ Text/Hamlet/Parse.hs | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/Text/Hamlet/Parse.hs b/Text/Hamlet/Parse.hs
+index 27b65a7..3f77df6 100644
+--- a/Text/Hamlet/Parse.hs
++++ b/Text/Hamlet/Parse.hs
+@@ -256,9 +256,8 @@ parseLine set = do
+ x <- parseHash
+ case x of
+ Left "#" -> case cr of
+- InContent -> return (ContentRaw "#", False)
+- NotInQuotesAttr -> return (ContentRaw "#", False)
+- _ -> fail "Expected hash at end of line, got Id"
++ NotInQuotes -> fail "Expected hash at end of lin, got Id"
++ _ -> return (ContentRaw "#", False)
+ Left str -> return (ContentRaw str, null str)
+ Right deref -> return (ContentVar deref, False)
+ contentAt = do
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-12-28 02:49:32 UTC (rev 203133)
+++ community-x86_64/PKGBUILD 2016-12-28 02:54:39 UTC (rev 203134)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
-
-_hkgname=shakespeare
-pkgname=haskell-shakespeare
-pkgver=2.0.12
-pkgrel=2
-pkgdesc="A toolkit for making compile-time interpolated templates"
-url="http://www.yesodweb.com/book/shakespearean-templates"
-license=("MIT")
-arch=('i686' 'x86_64')
-depends=("ghc=8.0.1" "haskell-aeson" "haskell-blaze-html" "haskell-blaze-markup"
- "haskell-exceptions" "haskell-parsec" "haskell-scientific" "haskell-text"
- "haskell-unordered-containers" "haskell-vector")
-source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
- issue201.patch)
-sha256sums=('9f07d26f00bba94ea47c35197132d22d8f6cb56de53bad818c5db8382c7cae91'
- '7f5fdcd7afe63168df07ad59c4c191c76b341e811d1952b4da089763a165c6ff')
-
-prepare() {
- cd "${srcdir}/${_hkgname}-${pkgver}"
- # https://github.com/yesodweb/shakespeare/pull/201
- patch -p1 -i ../issue201.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 \
- -f-test_roy -f-test_coffee -f-test_export
- 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.*update[^ ]* |&'--force' |" register.sh
- 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/register/${pkgname}.sh"
- install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.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-shakespeare/repos/community-x86_64/PKGBUILD (from rev 203133, haskell-shakespeare/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-12-28 02:54:39 UTC (rev 203134)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+_hkgname=shakespeare
+pkgname=haskell-shakespeare
+pkgver=2.0.12
+pkgrel=3
+pkgdesc="A toolkit for making compile-time interpolated templates"
+url="http://www.yesodweb.com/book/shakespearean-templates"
+license=("MIT")
+arch=('i686' 'x86_64')
+depends=("ghc=8.0.1" "haskell-aeson" "haskell-blaze-html" "haskell-blaze-markup"
+ "haskell-exceptions" "haskell-parsec" "haskell-scientific" "haskell-text"
+ "haskell-unordered-containers" "haskell-vector")
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+ issue201.patch)
+sha256sums=('9f07d26f00bba94ea47c35197132d22d8f6cb56de53bad818c5db8382c7cae91'
+ '01d6550508d2651cf5d7fdceaa929a6749ab1340977dbf3a0462325eb5a317c3')
+
+prepare() {
+ cd "${srcdir}/${_hkgname}-${pkgver}"
+ # https://github.com/yesodweb/shakespeare/pull/201
+ patch -p1 -i ../issue201.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 \
+ -f-test_roy -f-test_coffee -f-test_export
+ 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.*update[^ ]* |&'--force' |" register.sh
+ 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/register/${pkgname}.sh"
+ install -D -m744 unregister.sh "${pkgdir}/usr/share/haskell/unregister/${pkgname}.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-shakespeare/repos/community-x86_64/issue201.patch (from rev 203133, haskell-shakespeare/trunk/issue201.patch)
===================================================================
--- community-x86_64/issue201.patch (rev 0)
+++ community-x86_64/issue201.patch 2016-12-28 02:54:39 UTC (rev 203134)
@@ -0,0 +1,47 @@
+From 81875f9409cb306ec518d61812a6f3f075e16339 Mon Sep 17 00:00:00 2001
+From: Tyler Erickson <me at tylererickson.com>
+Date: Tue, 27 Dec 2016 12:09:46 -0800
+Subject: [PATCH] Fixed regression caused by previous merge
+
+---
+ Text/Hamlet/Parse.hs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Text/Hamlet/Parse.hs b/Text/Hamlet/Parse.hs
+index d0c9961..27b65a7 100644
+--- a/Text/Hamlet/Parse.hs
++++ b/Text/Hamlet/Parse.hs
+@@ -257,6 +257,7 @@ parseLine set = do
+ case x of
+ Left "#" -> case cr of
+ InContent -> return (ContentRaw "#", False)
++ NotInQuotesAttr -> return (ContentRaw "#", False)
+ _ -> fail "Expected hash at end of line, got Id"
+ Left str -> return (ContentRaw str, null str)
+ Right deref -> return (ContentVar deref, False)
+From b43ceba3f033e1aa83c3c424a661996a3e272194 Mon Sep 17 00:00:00 2001
+From: Tyler Erickson <me at tylererickson.com>
+Date: Tue, 27 Dec 2016 12:22:44 -0800
+Subject: [PATCH] Reversed Test cases; NotInQuotes -> fail; otherwise ->
+ succeed
+
+---
+ Text/Hamlet/Parse.hs | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/Text/Hamlet/Parse.hs b/Text/Hamlet/Parse.hs
+index 27b65a7..3f77df6 100644
+--- a/Text/Hamlet/Parse.hs
++++ b/Text/Hamlet/Parse.hs
+@@ -256,9 +256,8 @@ parseLine set = do
+ x <- parseHash
+ case x of
+ Left "#" -> case cr of
+- InContent -> return (ContentRaw "#", False)
+- NotInQuotesAttr -> return (ContentRaw "#", False)
+- _ -> fail "Expected hash at end of line, got Id"
++ NotInQuotes -> fail "Expected hash at end of lin, got Id"
++ _ -> return (ContentRaw "#", False)
+ Left str -> return (ContentRaw str, null str)
+ Right deref -> return (ContentVar deref, False)
+ contentAt = do
More information about the arch-commits
mailing list