[arch-commits] Commit in haskell-bytestring-tree-builder/trunk (2 files)

[Felix Yan]

    Date: Sunday, July 22, 2018 @ 07:06:08
  Author: felixonmars
Revision: 362771

upgpkg: haskell-bytestring-tree-builder 0.2.7.2-1

rebuild with bytestring-tree-builder 0.2.7.2

Modified:
  haskell-bytestring-tree-builder/trunk/PKGBUILD
Deleted:
  haskell-bytestring-tree-builder/trunk/ghc-8.4.patch

---------------+
 PKGBUILD      |   21 ++++++++++++---------
 ghc-8.4.patch |   23 -----------------------
 2 files changed, 12 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-22 06:55:52 UTC (rev 362770)
+++ PKGBUILD	2018-07-22 07:06:08 UTC (rev 362771)
@@ -4,22 +4,20 @@
 
 _hkgname=bytestring-tree-builder
 pkgname=haskell-bytestring-tree-builder
-pkgver=0.2.7.1
-pkgrel=17
+pkgver=0.2.7.2
+pkgrel=1
 pkgdesc="A very efficient ByteString builder implementation based on the binary tree"
 url="https://github.com/nikita-volkov/bytestring-tree-builder"
 license=("MIT")
 arch=('x86_64')
 depends=('ghc-libs' 'haskell-base-prelude')
-makedepends=('ghc')
-source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
-        ghc-8.4.patch)
-sha512sums=('cf522d6c13bb2fd6b23e0b78abec5836c20d19effcceb184646aa885df12c665738a9134b0cf6c8f5b30d05606c1a0880829600181342c678bb8ab32a9f3765d'
-            'dc21716549a6d0b35a564061130e058b1cd756895985385f16054dc5e4b47b59b71c4044aca14a1b651470cc788f5a1d60f495e534cc6360f992214aaa7e35fb')
+makedepends=('ghc' 'haskell-tasty' 'haskell-tasty-quickcheck' 'haskell-tasty-hunit'
+             'haskell-quickcheck-instances' 'haskell-quickcheck')
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
+sha512sums=('3df74926693ddc1387093ebc351754e5cd754596fc8dbf6f5bcfe2013b85e16296d38118409dcd25f59fa132deaf8c33fa07eebdeff7a9070e8b85b82a561ab9')
 
 prepare() {
     cd $_hkgname-$pkgver
-    patch -p1 -i ../ghc-8.4.patch
 
     sed -i '/semigroups/d' $_hkgname.cabal
 }
@@ -28,7 +26,7 @@
     cd "${srcdir}/${_hkgname}-${pkgver}"
     
     runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
-        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --enable-tests \
         --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build
     runhaskell Setup register --gen-script
@@ -37,6 +35,11 @@
     sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
+check() {
+    cd $_hkgname-$pkgver
+    runhaskell Setup test
+}
+
 package() {
     cd "${srcdir}/${_hkgname}-${pkgver}"
     

Deleted: ghc-8.4.patch
===================================================================
--- ghc-8.4.patch	2018-07-22 06:55:52 UTC (rev 362770)
+++ ghc-8.4.patch	2018-07-22 07:06:08 UTC (rev 362771)
@@ -1,23 +0,0 @@
-diff --git a/library/ByteString/TreeBuilder.hs.orig b/library/ByteString/TreeBuilder.hs
-index 18c7f05..5f8ffbb 100644
---- a/library/ByteString/TreeBuilder.hs.orig
-+++ b/library/ByteString/TreeBuilder.hs
-@@ -43,9 +43,6 @@ instance Monoid Builder where
-   {-# INLINE mempty #-}
-   mempty =
-     Builder 0 A.Empty
--  {-# INLINABLE mappend #-}
--  mappend (Builder length1 tree1) (Builder length2 tree2) =
--    Builder (length1 + length2) (A.Branch tree1 tree2)
-   {-# INLINE mconcat #-}
-   mconcat =
-     foldl' mappend mempty
-@@ -54,6 +51,8 @@ instance Semigroup Builder where
-   {-# INLINE sconcat #-}
-   sconcat =
-     foldl' mappend mempty
-+  Builder length1 tree1 <> Builder length2 tree2 =
-+    Builder (length1 + length2) (A.Branch tree1 tree2)
- 
- instance IsString Builder where
-   {-# INLINE fromString #-}