Date: Monday, May 21, 2018 @ 05:18:34 Author: felixonmars Revision: 325731
archrelease: copy trunk to community-staging-x86_64 Added: haskell-bytestring-strict-builder/repos/community-staging-x86_64/PKGBUILD (from rev 325730, haskell-bytestring-strict-builder/trunk/PKGBUILD) haskell-bytestring-strict-builder/repos/community-staging-x86_64/ghc-8.4.patch (from rev 325730, haskell-bytestring-strict-builder/trunk/ghc-8.4.patch) Deleted: haskell-bytestring-strict-builder/repos/community-staging-x86_64/PKGBUILD haskell-bytestring-strict-builder/repos/community-staging-x86_64/ghc-8.4.patch ---------------+ PKGBUILD | 110 ++++++++++++++++++++++++++++---------------------------- ghc-8.4.patch | 88 ++++++++++++++++++++++---------------------- 2 files changed, 99 insertions(+), 99 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-05-21 05:18:13 UTC (rev 325730) +++ PKGBUILD 2018-05-21 05:18:34 UTC (rev 325731) @@ -1,55 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> - -_hkgname=bytestring-strict-builder -pkgname=haskell-bytestring-strict-builder -pkgver=0.4.5 -pkgrel=11 -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' - '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') - -prepare() { - cd $_hkgname-$pkgver - patch -p1 -i ../ghc-8.4.patch - - sed -e '/semigroups/d' \ - -e 's/==.*,/,/' \ - -i $_hkgname.cabal -} - -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 - runhaskell Setup build - 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 -} - -check() { - cd $_hkgname-$pkgver - runhaskell Setup test -} - -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}" - install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE" -} Copied: haskell-bytestring-strict-builder/repos/community-staging-x86_64/PKGBUILD (from rev 325730, haskell-bytestring-strict-builder/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-05-21 05:18:34 UTC (rev 325731) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +_hkgname=bytestring-strict-builder +pkgname=haskell-bytestring-strict-builder +pkgver=0.4.5 +pkgrel=12 +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' + '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') + +prepare() { + cd $_hkgname-$pkgver + patch -p1 -i ../ghc-8.4.patch + + sed -e '/semigroups/d' \ + -e 's/==.*,/,/' \ + -i $_hkgname.cabal +} + +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 + runhaskell Setup build + 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 +} + +check() { + cd $_hkgname-$pkgver + runhaskell Setup test +} + +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}" + install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE" +} Deleted: ghc-8.4.patch =================================================================== --- ghc-8.4.patch 2018-05-21 05:18:13 UTC (rev 325730) +++ ghc-8.4.patch 2018-05-21 05:18:34 UTC (rev 325731) @@ -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 = Copied: haskell-bytestring-strict-builder/repos/community-staging-x86_64/ghc-8.4.patch (from rev 325730, haskell-bytestring-strict-builder/trunk/ghc-8.4.patch) =================================================================== --- ghc-8.4.patch (rev 0) +++ ghc-8.4.patch 2018-05-21 05:18:34 UTC (rev 325731) @@ -0,0 +1,44 @@ +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 =