Date: Thursday, June 7, 2018 @ 10:16:47 Author: felixonmars Revision: 341730
upgpkg: haskell-bytestring-strict-builder 0.4.5.1-1 rebuild with bytestring-strict-builder 0.4.5.1 Modified: haskell-bytestring-strict-builder/trunk/PKGBUILD Deleted: haskell-bytestring-strict-builder/trunk/ghc-8.4.patch ---------------+ PKGBUILD | 18 ++++++------------ ghc-8.4.patch | 44 -------------------------------------------- 2 files changed, 6 insertions(+), 56 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-06-07 09:51:13 UTC (rev 341729) +++ PKGBUILD 2018-06-07 10:16:47 UTC (rev 341730) @@ -3,27 +3,21 @@ _hkgname=bytestring-strict-builder pkgname=haskell-bytestring-strict-builder -pkgver=0.4.5 -pkgrel=24 +pkgver=0.4.5.1 +pkgrel=1 pkgdesc="An efficient strict bytestring builder" url="https://github.com/nikita-volkov/bytestring-strict-builder"; license=('MIT') arch=('x86_64') depends=('ghc-libs' 'haskell-base-prelude') -makedepends=('ghc' 'haskell-tasty' 'haskell-tasty-quickcheck' 'haskell-tasty-smallcheck' +makedepends=('ghc' 'haskell-quickcheck' 'haskell-tasty' 'haskell-tasty-quickcheck' 'haskell-tasty-hunit' 'haskell-quickcheck-instances' 'haskell-rerebase') -source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"; - ghc-8.4.patch) -sha512sums=('b1e0a551abf663daeaf71cb36e883e5b3db0a5112d7190d0743a5ed26aa334d3fede5be8c35dc2821d24d1fd88eae1de7e4983cc31bdc5c14960defc0ce47bcd' - '7ed27930fef2b2709dfa6a66a09cebd1300361ecc40aca4735984c6364eda70a176fc7dbad198c6b45ef6303e5fc8fdaecda1ef30de5eb45e68eec26f555009f') +source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz";) +sha512sums=('f9ebf1e959ba01674fd302571737ff1ef7b5150866a052560c20050f78aedf01e068a494b259a3dbc244db972662ae316205b8626e9c2721d54e46984ed27cd5') prepare() { cd $_hkgname-$pkgver - patch -p1 -i ../ghc-8.4.patch - - sed -e '/semigroups/d' \ - -e 's/==.*,/,/' \ - -i $_hkgname.cabal + sed -e '/semigroups/d' -i $_hkgname.cabal } build() { Deleted: ghc-8.4.patch =================================================================== --- ghc-8.4.patch 2018-06-07 09:51:13 UTC (rev 341729) +++ ghc-8.4.patch 2018-06-07 10:16:47 UTC (rev 341730) @@ -1,44 +0,0 @@ -diff --git a/library/ByteString/StrictBuilder/Population.hs.orig b/library/ByteString/StrictBuilder/Population.hs -index 4134009..e423daf 100644 ---- a/library/ByteString/StrictBuilder/Population.hs.orig -+++ b/library/ByteString/StrictBuilder/Population.hs -@@ -16,11 +16,10 @@ instance Monoid Population where - {-# INLINE mempty #-} - mempty = - Population return -- {-# INLINE mappend #-} -- mappend (Population leftPtrUpdate) (Population rightPtrUpdate) = -- Population (leftPtrUpdate >=> rightPtrUpdate) - --instance Semigroup Population -+instance Semigroup Population where -+ Population leftPtrUpdate <> Population rightPtrUpdate = -+ Population (leftPtrUpdate >=> rightPtrUpdate) - - - {-| -diff --git a/library/ByteString/StrictBuilder.hs.orig b/library/ByteString/StrictBuilder.hs -index b7f36b8..69921c0 100644 ---- a/library/ByteString/StrictBuilder.hs.orig -+++ b/library/ByteString/StrictBuilder.hs -@@ -38,9 +38,6 @@ instance Monoid Builder where - {-# INLINE mempty #-} - mempty = - Builder 0 mempty -- {-# INLINE mappend #-} -- mappend (Builder leftSize leftPopulation) (Builder rightSize rightPopulation) = -- Builder (leftSize + rightSize) (leftPopulation <> rightPopulation) - {-# INLINE mconcat #-} - mconcat builders = - Builder size population -@@ -50,7 +47,9 @@ instance Monoid Builder where - population = - foldMap (\(Builder _ x) -> x) builders - --instance Semigroup Builder -+instance Semigroup Builder where -+ Builder leftSize leftPopulation <> Builder rightSize rightPopulation = -+ Builder (leftSize + rightSize) (leftPopulation <> rightPopulation) - - instance IsString Builder where - fromString =
