[arch-commits] Commit in haskell-mono-traversable/trunk (PKGBUILD ghc9.patch)

[Felix Yan]

    Date: Sunday, June 20, 2021 @ 22:11:11
  Author: felixonmars
Revision: 966091

upgpkg: haskell-mono-traversable 1.0.15.1-139: rebuild with ghc 9.0.1

Added:
  haskell-mono-traversable/trunk/ghc9.patch
Modified:
  haskell-mono-traversable/trunk/PKGBUILD

------------+
 PKGBUILD   |   16 +++++++++++-----
 ghc9.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-20 22:10:42 UTC (rev 966090)
+++ PKGBUILD	2021-06-20 22:11:11 UTC (rev 966091)
@@ -4,7 +4,7 @@
 _hkgname=mono-traversable
 pkgname=haskell-mono-traversable
 pkgver=1.0.15.1
-pkgrel=138
+pkgrel=139
 pkgdesc="Type classes for mapping, folding, and traversing monomorphic containers"
 url="https://github.com/snoyberg/mono-traversable"
 license=("MIT")
@@ -11,13 +11,19 @@
 arch=('x86_64')
 depends=('ghc-libs' 'haskell-hashable' 'haskell-split' 'haskell-unordered-containers'
          'haskell-vector' 'haskell-vector-algorithms')
-makedepends=('ghc' 'haskell-hunit' 'haskell-quickcheck' 'haskell-foldl' 'haskell-hspec')
-source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-sha512sums=('adf1af35b93af0605667d8b033415f318c6dab225499fdd1d9eab349fb1eedca2623c98f9dce83f94ed27db75b6f0aa88027daa748c7b3db05f47f68b505b0c8')
+makedepends=('ghc' 'uusi' 'haskell-hunit' 'haskell-quickcheck' 'haskell-foldl' 'haskell-hspec')
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+        ghc9.patch)
+sha512sums=('adf1af35b93af0605667d8b033415f318c6dab225499fdd1d9eab349fb1eedca2623c98f9dce83f94ed27db75b6f0aa88027daa748c7b3db05f47f68b505b0c8'
+            '5fcbb4021f14a22198f352b3d223a14e3bd420e6b991d17e76db99aea1a89070ad915fe55f80928181588457013e0e542621c9cf6aa875ef382ac6bb861bcbb2')
 
 prepare() {
     cd $_hkgname-$pkgver
-    sed -i '/semigroups/d' $_hkgname.cabal
+    # https://github.com/snoyberg/mono-traversable/issues/192
+    patch -p2 -i ../ghc9.patch
+    sed -i 's/main.hs/Main.hs/;/Spec/d' $_hkgname.cabal
+
+    uusi -d semigroups $_hkgname.cabal
 }
 
 build() {

Added: ghc9.patch
===================================================================
--- ghc9.patch	                        (rev 0)
+++ ghc9.patch	2021-06-20 22:11:11 UTC (rev 966091)
@@ -0,0 +1,31 @@
+commit 00c4ed6ed6231d30f211cd83062507448b7ffca4
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Mon Jun 21 06:01:10 2021 +0800
+
+    Fix tests in GHC 9.0
+    
+    Implements #192
+
+diff --git a/mono-traversable/test/Spec.hs b/mono-traversable/test/Main.hs
+similarity index 99%
+rename from mono-traversable/test/Spec.hs
+rename to mono-traversable/test/Main.hs
+index e8d2357..befda4c 100644
+--- a/mono-traversable/test/Spec.hs
++++ b/mono-traversable/test/Main.hs
+@@ -6,7 +6,7 @@
+ {-# LANGUAGE ScopedTypeVariables #-}
+ {-# LANGUAGE PatternSynonyms #-}
+ 
+-module Spec where
++module Main where
+ 
+ import Data.MonoTraversable
+ import Data.Containers
+diff --git a/mono-traversable/test/main.hs b/mono-traversable/test/main.hs
+deleted file mode 100644
+index a4754a0..0000000
+--- a/mono-traversable/test/main.hs
++++ /dev/null
+@@ -1 +0,0 @@
+-import Spec (main)