[arch-commits] Commit in haskell-project-template/trunk (2 files)

2020-07-15 Thread Felix Yan via arch-commits 
Date: Wednesday, July 15, 2020 @ 08:38:06
  Author: felixonmars
Revision: 663861

upgpkg: haskell-project-template 0.2.1.0-1: rebuild with - 0.2.1.0

Modified:
  haskell-project-template/trunk/PKGBUILD
Deleted:
  haskell-project-template/trunk/base64-bytestring-1.1.patch

-+
 PKGBUILD|   15 +-
 base64-bytestring-1.1.patch |   98 --
 2 files changed, 4 insertions(+), 109 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-15 08:37:48 UTC (rev 663860)
+++ PKGBUILD2020-07-15 08:38:06 UTC (rev 663861)
@@ -3,8 +3,8 @@
 
 _hkgname=project-template
 pkgname=haskell-project-template
-pkgver=0.2.0.1
-pkgrel=240
+pkgver=0.2.1.0
+pkgrel=1
 pkgdesc="Specify Haskell project templates and generate files"
 url="https://github.com/fpco/haskell-ide;
 license=("BSD")
@@ -12,16 +12,9 @@
 depends=('ghc-libs' 'haskell-base64-bytestring' 'haskell-conduit' 
'haskell-conduit-extra'
  'haskell-resourcet')
 makedepends=('ghc' 'haskell-hspec' 'haskell-quickcheck')
-source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz;
-base64-bytestring-1.1.patch)
-sha512sums=('bc5824086ba8dfaff4ff64c5115d37ea5e496d7692f1120b11c2a878e522119d362c7d119ccf7b9cc064c58f9ce6382b5e24a69cdac5ac5d683c4d616e2c66ea'
-
'c426265cdb54a4c62d4ea743cf381f07f20e0641daea194ab17afbb15ee74db968a030260beb39158594c10131b78b6aaa2c04160e8f50d5d69d166e2d932f02')
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz;)
+sha512sums=('ed70f640e5197f7a6158b851dcd3990e77b7266f716be248ecfb012c4827dc688028aa78d649313203a274357f57e45e94371a09446c4404d3282add0d1a158c')
 
-prepare() {
-cd $_hkgname-$pkgver
-patch -p1 -i ../base64-bytestring-1.1.patch
-}
-
 build() {
 cd $_hkgname-$pkgver
 

Deleted: base64-bytestring-1.1.patch
===
--- base64-bytestring-1.1.patch 2020-07-15 08:37:48 UTC (rev 663860)
+++ base64-bytestring-1.1.patch 2020-07-15 08:38:06 UTC (rev 663861)
@@ -1,98 +0,0 @@
 project-template-0.2.0.1/Text/ProjectTemplate.hs.orig  2020-04-26 
07:50:54.007400644 +0800
-+++ project-template-0.2.0.1/Text/ProjectTemplate.hs   2020-04-26 
07:56:46.698254606 +0800
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE BangPatterns  #-}
- {-# LANGUAGE DeriveDataTypeable#-}
- {-# LANGUAGE FlexibleContexts  #-}
- {-# LANGUAGE MultiParamTypeClasses #-}
-@@ -15,6 +16,7 @@
- , receiveFS
-   -- * Exceptions
- , ProjectTemplateException (..)
-+, joinWith
- ) where
- 
- import   Control.Exception(Exception, assert)
-@@ -27,6 +29,7 @@
- import   Data.ByteString  (ByteString)
- import qualified Data.ByteString  as S
- import qualified Data.ByteString.Base64   as B64
-+import   Data.ByteString.Internal
- import qualified Data.ByteString.Lazy as L
- import   Data.Conduit (ConduitM, await,
-awaitForever, leftover, yield,
-@@ -42,6 +45,8 @@
- import   Data.Text.Encoding   (encodeUtf8)
- import   Data.Typeable(Typeable)
- import   Data.Void(Void)
-+import   Foreign.ForeignPtr   (withForeignPtr)
-+import   Foreign.Ptr  (minusPtr, plusPtr)
- import   System.Directory (createDirectoryIfMissing)
- import   System.FilePath  (takeDirectory, ())
- 
-@@ -57,7 +62,7 @@
- yield "{-# START_FILE BASE64 "
- yield $ encodeUtf8 $ T.pack fp
- yield " #-}\n"
--yield $ B64.joinWith "\n" 76 $ B64.encode bs
-+yield $ joinWith "\n" 76 $ B64.encode bs
- yield "\n"
- Just _ -> do
- yield "{-# START_FILE "
-@@ -194,3 +199,45 @@
- 
- assertion1 = assert $ S.length bs1 < size
- assertion2 = assert $ S.length bs1' `mod` size == 0
-+
-+-- | Efficiently intersperse a terminator string into another at
-+-- regular intervals, and terminate the input with it.
-+--
-+-- Examples:
-+--
-+-- > joinWith "|" 2 "" = "--|--|"
-+--
-+-- > joinWith "\r\n" 3 "foobarbaz" = "foo\r\nbar\r\nbaz\r\n"
-+-- > joinWith "x" 3 "fo" = "fox"
-+joinWith :: ByteString  -- ^ String to intersperse and end with
-+ -> Int -- ^ Interval at which to intersperse, in bytes
-+ -> ByteString  -- ^ String to transform
-+ -> ByteString
-+joinWith brk@(PS bfp boff blen) every' bs@(PS sfp soff slen)
-+| every' <= 0 = error "invalid interval"
-+| blen <= 0  = bs
-+| S.null bs = brk
-+| otherwise =
-+  unsafeCreate dlen $ \dptr ->
-+withForeignPtr bfp $ \bptr -> do
-+  withForeignPtr sfp $ \sptr -> do
-+  let bp =

[arch-commits] Commit in haskell-project-template/trunk (2 files)

2020-04-25 Thread Felix Yan via arch-commits 
Date: Saturday, April 25, 2020 @ 23:59:28
  Author: felixonmars
Revision: 621228

upgpkg: haskell-project-template 0.2.0.1-225: rebuild with base64-bytestring 
1.1.0.0

Added:
  haskell-project-template/trunk/base64-bytestring-1.1.patch
Modified:
  haskell-project-template/trunk/PKGBUILD

-+
 PKGBUILD|   17 +--
 base64-bytestring-1.1.patch |   98 ++
 2 files changed, 110 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-25 23:59:25 UTC (rev 621227)
+++ PKGBUILD2020-04-25 23:59:28 UTC (rev 621228)
@@ -4,7 +4,7 @@
 _hkgname=project-template
 pkgname=haskell-project-template
 pkgver=0.2.0.1
-pkgrel=224
+pkgrel=225
 pkgdesc="Specify Haskell project templates and generate files"
 url="https://github.com/fpco/haskell-ide;
 license=("BSD")
@@ -12,12 +12,19 @@
 depends=('ghc-libs' 'haskell-base64-bytestring' 'haskell-conduit' 
'haskell-conduit-extra'
  'haskell-resourcet')
 makedepends=('ghc' 'haskell-hspec' 'haskell-quickcheck')
-source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz;)
-sha512sums=('bc5824086ba8dfaff4ff64c5115d37ea5e496d7692f1120b11c2a878e522119d362c7d119ccf7b9cc064c58f9ce6382b5e24a69cdac5ac5d683c4d616e2c66ea')
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz;
+base64-bytestring-1.1.patch)
+sha512sums=('bc5824086ba8dfaff4ff64c5115d37ea5e496d7692f1120b11c2a878e522119d362c7d119ccf7b9cc064c58f9ce6382b5e24a69cdac5ac5d683c4d616e2c66ea'
+
'c426265cdb54a4c62d4ea743cf381f07f20e0641daea194ab17afbb15ee74db968a030260beb39158594c10131b78b6aaa2c04160e8f50d5d69d166e2d932f02')
 
+prepare() {
+cd $_hkgname-$pkgver
+patch -p1 -i ../base64-bytestring-1.1.patch
+}
+
 build() {
 cd $_hkgname-$pkgver
-
+
 runhaskell Setup configure -O --enable-shared --enable-executable-dynamic 
--disable-library-vanilla \
 --prefix=/usr --docdir=/usr/share/doc/$pkgname --enable-tests \
 --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
@@ -35,7 +42,7 @@
 
 package() {
 cd $_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
 runhaskell Setup copy --destdir="$pkgdir"

Added: base64-bytestring-1.1.patch
===
--- base64-bytestring-1.1.patch (rev 0)
+++ base64-bytestring-1.1.patch 2020-04-25 23:59:28 UTC (rev 621228)
@@ -0,0 +1,98 @@
+--- project-template-0.2.0.1/Text/ProjectTemplate.hs.orig  2020-04-26 
07:50:54.007400644 +0800
 project-template-0.2.0.1/Text/ProjectTemplate.hs   2020-04-26 
07:56:46.698254606 +0800
+@@ -1,3 +1,4 @@
++{-# LANGUAGE BangPatterns  #-}
+ {-# LANGUAGE DeriveDataTypeable#-}
+ {-# LANGUAGE FlexibleContexts  #-}
+ {-# LANGUAGE MultiParamTypeClasses #-}
+@@ -15,6 +16,7 @@
+ , receiveFS
+   -- * Exceptions
+ , ProjectTemplateException (..)
++, joinWith
+ ) where
+ 
+ import   Control.Exception(Exception, assert)
+@@ -27,6 +29,7 @@
+ import   Data.ByteString  (ByteString)
+ import qualified Data.ByteString  as S
+ import qualified Data.ByteString.Base64   as B64
++import   Data.ByteString.Internal
+ import qualified Data.ByteString.Lazy as L
+ import   Data.Conduit (ConduitM, await,
+awaitForever, leftover, yield,
+@@ -42,6 +45,8 @@
+ import   Data.Text.Encoding   (encodeUtf8)
+ import   Data.Typeable(Typeable)
+ import   Data.Void(Void)
++import   Foreign.ForeignPtr   (withForeignPtr)
++import   Foreign.Ptr  (minusPtr, plusPtr)
+ import   System.Directory (createDirectoryIfMissing)
+ import   System.FilePath  (takeDirectory, ())
+ 
+@@ -57,7 +62,7 @@
+ yield "{-# START_FILE BASE64 "
+ yield $ encodeUtf8 $ T.pack fp
+ yield " #-}\n"
+-yield $ B64.joinWith "\n" 76 $ B64.encode bs
++yield $ joinWith "\n" 76 $ B64.encode bs
+ yield "\n"
+ Just _ -> do
+ yield "{-# START_FILE "
+@@ -194,3 +199,45 @@
+ 
+ assertion1 = assert $ S.length bs1 < size
+ assertion2 = assert $ S.length bs1' `mod` size == 0
++
++-- | Efficiently intersperse a terminator string into another at
++-- regular intervals, and terminate the input with it.
++--
++-- Examples:
++--
++-- > joinWith "|" 2 "" = "--|--|"
++--
++-- > joinWith "\r\n" 3 "foobarbaz" = "foo\r\nbar\r\nbaz\r\n"
++-- > joinWith "x" 3

[arch-commits] Commit in haskell-project-template/trunk (2 files)

2016-05-25 Thread Felix Yan 
Date: Wednesday, May 25, 2016 @ 15:45:14
  Author: fyan
Revision: 176874

upgpkg: haskell-project-template 0.2.0-25

rebuild with ghc-8.0.1, base-prelude-1.0.1.1, cabal-install-1.24.0.0, 
cairo-0.13.2.0, cmark-0.5.2.1, data-default-0.7.0, data-default-class-0.1.0, 
extra-1.4.7, generic-trie-0.3.0.2, glib-0.13.3.0, gtk3-0.14.3, 
haddock-api-2.17.2, haddock-library-1.4.1, js-jquery-1.12.4, memory-0.13, 
microlens-0.4.4.0, network-multicast-0.1.1, pango-0.13.2.0, 
simple-sendfile-0.2.24, stack-1.1.2, texmath-0.8.6.3, wai-3.2.1.1

Modified:
  haskell-project-template/trunk/PKGBUILD
Deleted:
  haskell-project-template/trunk/haskell-project-template.install

--+
 PKGBUILD |   11 +--
 haskell-project-template.install |   18 --
 2 files changed, 5 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-25 13:44:26 UTC (rev 176873)
+++ PKGBUILD2016-05-25 13:45:14 UTC (rev 176874)
@@ -5,17 +5,15 @@
 _hkgname=project-template
 pkgname=haskell-project-template
 pkgver=0.2.0
-pkgrel=24
+pkgrel=25
 pkgdesc="Specify Haskell project templates and generate files"
 url="https://github.com/fpco/haskell-ide;
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
-depends=("ghc=7.10.3" "haskell-base64-bytestring" "haskell-conduit"
+depends=("ghc=8.0.1" "haskell-base64-bytestring" "haskell-conduit"
  "haskell-conduit-extra" "haskell-mtl" "haskell-resourcet"
  "haskell-text")
-options=('staticlibs')
 
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz;)
-install="${pkgname}.install"
 sha256sums=('aeabd7d1785b31abaffc78f02d9dda67d57d01822755f09614bfc65e99506310')
 
 build() {
@@ -28,6 +26,7 @@
 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
 }
 
@@ -34,8 +33,8 @@
 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 -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}"

Deleted: haskell-project-template.install
===
--- haskell-project-template.install2016-05-25 13:44:26 UTC (rev 176873)
+++ haskell-project-template.install2016-05-25 13:45:14 UTC (rev 176874)
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-project-template
-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)
-}