Date: Friday, May 18, 2018 @ 05:30:35 Author: felixonmars Revision: 324148
upgpkg: haskell-ranged-sets 0.3.0-11 rebuild with ghc 8.4.2 Added: haskell-ranged-sets/trunk/ghc-8.4.patch Modified: haskell-ranged-sets/trunk/PKGBUILD ---------------+ PKGBUILD | 13 ++++++++++--- ghc-8.4.patch | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-05-18 05:23:18 UTC (rev 324147) +++ PKGBUILD 2018-05-18 05:30:35 UTC (rev 324148) @@ -4,7 +4,7 @@ _hkgname=Ranged-sets pkgname=haskell-ranged-sets pkgver=0.3.0 -pkgrel=10 +pkgrel=11 pkgdesc="Ranged sets for Haskell" url="http://code.haskell.org/ranged-sets" license=('custom:BSD3') @@ -11,9 +11,16 @@ 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) -sha512sums=('4145fcfe12616a044a8152bbe90742c6ea4ff2400bb289c97a490a72910a0f5d7c6f3317bebc559499b4447ddb01434c573baf25afffa8a4b2a92bb2e3c7a4c8') +source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz + ghc-8.4.patch) +sha512sums=('4145fcfe12616a044a8152bbe90742c6ea4ff2400bb289c97a490a72910a0f5d7c6f3317bebc559499b4447ddb01434c573baf25afffa8a4b2a92bb2e3c7a4c8' + '5d47e5ea4ee9ddc7c48f489714304794d644a3e489230de63bd414965169c6c0e4236162174cba8c89f01f3d322e0c30bc9264a5896f3bf2d894f17a549d991e') +prepare() { + cd $_hkgname-$pkgver + patch -p1 -i ../ghc-8.4.patch +} + build() { cd "${srcdir}/${_hkgname}-${pkgver}" Added: ghc-8.4.patch =================================================================== --- ghc-8.4.patch (rev 0) +++ ghc-8.4.patch 2018-05-18 05:30:35 UTC (rev 324148) @@ -0,0 +1,24 @@ +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.