[arch-commits] Commit in haskell-ranged-sets/repos/community-staging-x86_64 (4 files)

[Felix Yan]

    Date: Saturday, June 2, 2018 @ 09:43:35
  Author: felixonmars
Revision: 337270

archrelease: copy trunk to community-staging-x86_64

Added:
  haskell-ranged-sets/repos/community-staging-x86_64/PKGBUILD
    (from rev 337269, haskell-ranged-sets/trunk/PKGBUILD)
  haskell-ranged-sets/repos/community-staging-x86_64/ghc-8.4.patch
    (from rev 337269, haskell-ranged-sets/trunk/ghc-8.4.patch)
Deleted:
  haskell-ranged-sets/repos/community-staging-x86_64/PKGBUILD
  haskell-ranged-sets/repos/community-staging-x86_64/ghc-8.4.patch

---------------+
 PKGBUILD      |   90 ++++++++++++++++++++++++++++----------------------------
 ghc-8.4.patch |   48 ++++++++++++++---------------
 2 files changed, 69 insertions(+), 69 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-02 09:43:08 UTC (rev 337269)
+++ PKGBUILD	2018-06-02 09:43:35 UTC (rev 337270)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-_hkgname=Ranged-sets
-pkgname=haskell-ranged-sets
-pkgver=0.3.0
-pkgrel=13
-pkgdesc="Ranged sets for Haskell"
-url="http://code.haskell.org/ranged-sets"
-license=('custom:BSD3')
-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')
-
-prepare() {
-    cd $_hkgname-$pkgver
-    patch -p1 -i ../ghc-8.4.patch
-}
-
-build() {
-    cd "${srcdir}/${_hkgname}-${pkgver}"
-    
-    runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
-        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
-        --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
-}
-
-package() {
-    cd "${srcdir}/${_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.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
-    rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE.txt"
-}

Copied: haskell-ranged-sets/repos/community-staging-x86_64/PKGBUILD (from rev 337269, haskell-ranged-sets/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-06-02 09:43:35 UTC (rev 337270)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+_hkgname=Ranged-sets
+pkgname=haskell-ranged-sets
+pkgver=0.3.0
+pkgrel=14
+pkgdesc="Ranged sets for Haskell"
+url="http://code.haskell.org/ranged-sets"
+license=('custom:BSD3')
+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')
+
+prepare() {
+    cd $_hkgname-$pkgver
+    patch -p1 -i ../ghc-8.4.patch
+}
+
+build() {
+    cd "${srcdir}/${_hkgname}-${pkgver}"
+    
+    runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgname}" \
+        --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
+}
+
+package() {
+    cd "${srcdir}/${_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.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+    rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE.txt"
+}

Deleted: ghc-8.4.patch
===================================================================
--- ghc-8.4.patch	2018-06-02 09:43:08 UTC (rev 337269)
+++ ghc-8.4.patch	2018-06-02 09:43:35 UTC (rev 337270)
@@ -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.

Copied: haskell-ranged-sets/repos/community-staging-x86_64/ghc-8.4.patch (from rev 337269, haskell-ranged-sets/trunk/ghc-8.4.patch)
===================================================================
--- ghc-8.4.patch	                        (rev 0)
+++ ghc-8.4.patch	2018-06-02 09:43:35 UTC (rev 337270)
@@ -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.