Date: Tuesday, March 12, 2019 @ 09:11:47 Author: felixonmars Revision: 440607
upgpkg: haskell-ranged-sets 0.4.0-1 rebuild with Ranged-sets 0.4.0 Modified: haskell-ranged-sets/trunk/PKGBUILD Deleted: haskell-ranged-sets/trunk/ghc-8.4.patch ---------------+ PKGBUILD | 22 ++++++++++------------ ghc-8.4.patch | 24 ------------------------ 2 files changed, 10 insertions(+), 36 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-03-12 09:04:14 UTC (rev 440606) +++ PKGBUILD 2019-03-12 09:11:47 UTC (rev 440607) @@ -2,8 +2,8 @@ _hkgname=Ranged-sets pkgname=haskell-ranged-sets -pkgver=0.3.0 -pkgrel=19 +pkgver=0.4.0 +pkgrel=1 pkgdesc="Ranged sets for Haskell" url="http://code.haskell.org/ranged-sets"; license=('BSD') @@ -10,21 +10,14 @@ arch=('x86_64') depends=('ghc-libs' 'haskell-hunit' 'haskell-quickcheck') makedepends=('ghc') -source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz - ghc-8.4.patch) -sha512sums=('4145fcfe12616a044a8152bbe90742c6ea4ff2400bb289c97a490a72910a0f5d7c6f3317bebc559499b4447ddb01434c573baf25afffa8a4b2a92bb2e3c7a4c8' - '5d47e5ea4ee9ddc7c48f489714304794d644a3e489230de63bd414965169c6c0e4236162174cba8c89f01f3d322e0c30bc9264a5896f3bf2d894f17a549d991e') +source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +sha512sums=('9dc63ab9f31c6233b7f663c2674d8bd95bb9ea8ab6eb6ba04a634e9596e861c003b82f1c8d04e289e64b2edf4f2b64afca36e688727edd281eb7f571fb605f92') -prepare() { - cd $_hkgname-$pkgver - patch -p1 -i ../ghc-8.4.patch -} - build() { cd $_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 @@ -33,6 +26,11 @@ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } +check() { + cd $_hkgname-$pkgver + runhaskell Setup test +} + package() { cd $_hkgname-$pkgver Deleted: ghc-8.4.patch =================================================================== --- ghc-8.4.patch 2019-03-12 09:04:14 UTC (rev 440606) +++ ghc-8.4.patch 2019-03-12 09:11:47 UTC (rev 440607) @@ -1,24 +0,0 @@ -diff --git a/Data/Ranged/RangedSet.hs.orig b/Data/Ranged/RangedSet.hs -index eca86ef..922b1d6 100644 ---- a/Data/Ranged/RangedSet.hs.orig -+++ b/Data/Ranged/RangedSet.hs -@@ -58,7 +58,6 @@ module Data.Ranged.RangedSet ( - - import Data.Ranged.Boundaries - import Data.Ranged.Ranges --import Data.Monoid - - import Data.List - import Test.QuickCheck -@@ -72,8 +71,10 @@ infixl 5 -<=-, -<-, -?- - newtype DiscreteOrdered v => RSet v = RSet {rSetRanges :: [Range v]} - deriving (Eq, Show) - -+instance DiscreteOrdered a => Semigroup (RSet a) where -+ (<>) = rSetUnion -+ - instance DiscreteOrdered a => Monoid (RSet a) where -- mappend = rSetUnion - mempty = rSetEmpty - - -- | Determine if the ranges in the list are both in order and non-overlapping.
