[arch-commits] Commit in haskell-text-show/trunk (2 files)

[Felix Yan]

    Date: Saturday, September 4, 2021 @ 08:00:37
  Author: felixonmars
Revision: 1010780

upgpkg: haskell-text-show 3.9-101: rebuild with generic-deriving 1.14.1

Added:
  haskell-text-show/trunk/haskell-text-show-generic-deriving-1.14.1.patch
Modified:
  haskell-text-show/trunk/PKGBUILD

-------------------------------------------------+
 PKGBUILD                                        |   12 +++-
 haskell-text-show-generic-deriving-1.14.1.patch |   59 ++++++++++++++++++++++
 2 files changed, 68 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-04 07:05:38 UTC (rev 1010779)
+++ PKGBUILD	2021-09-04 08:00:37 UTC (rev 1010780)
@@ -3,7 +3,7 @@
 _hkgname=text-show
 pkgname=haskell-text-show
 pkgver=3.9
-pkgrel=100
+pkgrel=101
 pkgdesc="Efficient conversion of values into Text"
 url="https://github.com/RyanGlScott/text-show"
 license=('BSD')
@@ -12,11 +12,17 @@
          'haskell-th-abstraction' 'haskell-th-lift' 'haskell-transformers-compat')
 makedepends=('ghc' 'haskell-base-orphans' 'haskell-deriving-compat' 'haskell-hspec'
              'haskell-quickcheck' 'haskell-quickcheck-instances')
-source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-sha512sums=('fd2b1ae6e4b3de09950dff0557ee35e1754e24c5f1a88876418f8a3635fe4b3eb5d7fdea9893ba7d95324a286625805696e438fcef92ae580f2214409b514820')
+source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz
+        $pkgname-base-4.16.patch::https://github.com/RyanGlScott/text-show/commit/92d4f5ec633bb2c131de41bf695054f33a748caa.patch
+        $pkgname-generic-deriving-1.14.1.patch)
+sha512sums=('fd2b1ae6e4b3de09950dff0557ee35e1754e24c5f1a88876418f8a3635fe4b3eb5d7fdea9893ba7d95324a286625805696e438fcef92ae580f2214409b514820'
+            '6c748f94a7016f1a97add94bc12afb72e2dce8da0aad70f5cbb32498418054eebdc83f4c953ff884689bfa87c7e7f9d682fa94ff0ab3f260c03d1f6ca4d586f9'
+            '328567f99dbac0952f4d006eec9e85bb762457339b988b815d1a28785c48c89ca5dab6103f7ac496d046dd41c0ffc1e5457f2e072e70eea910327ce9b7076445')
 
 prepare() {
     cd $_hkgname-$pkgver
+    patch -p1 -i ../$pkgname-base-4.16.patch
+    patch -p1 -i ../$pkgname-generic-deriving-1.14.1.patch
     sed -i -e '/bytestring-builder/d' $_hkgname.cabal
 }
 

Added: haskell-text-show-generic-deriving-1.14.1.patch
===================================================================
--- haskell-text-show-generic-deriving-1.14.1.patch	                        (rev 0)
+++ haskell-text-show-generic-deriving-1.14.1.patch	2021-09-04 08:00:37 UTC (rev 1010780)
@@ -0,0 +1,59 @@
+From 3a78fcfe82786c228173f402b41dcfa116a9b54c Mon Sep 17 00:00:00 2001
+From: Ryan Scott <ryan.gl.scott at gmail.com>
+Date: Mon, 30 Aug 2021 07:18:11 -0400
+Subject: [PATCH] Test suite: require generic-deriving-1.14.1 or later
+
+---
+ CHANGELOG.md                  |  3 +++
+ tests/Instances/Data/Tuple.hs | 16 ----------------
+ text-show.cabal               |  2 +-
+ 3 files changed, 4 insertions(+), 17 deletions(-)
+
+diff --git a/tests/Instances/Data/Tuple.hs b/tests/Instances/Data/Tuple.hs
+index 1496525..8568939 100644
+--- a/tests/Instances/Data/Tuple.hs
++++ b/tests/Instances/Data/Tuple.hs
+@@ -1,6 +1,3 @@
+-{-# LANGUAGE CPP                #-}
+-{-# LANGUAGE DeriveGeneric      #-}
+-{-# LANGUAGE StandaloneDeriving #-}
+ {-# OPTIONS_GHC -fno-warn-orphans #-}
+ 
+ {-|
+@@ -19,10 +16,6 @@ import Data.Orphans ()
+ import Instances.Utils.GenericArbitrary (genericArbitrary)
+ import Test.QuickCheck (Arbitrary(..))
+ 
+-#if !(MIN_VERSION_base(4,16,0))
+-import GHC.Generics (Generic)
+-#endif
+-
+ instance ( Arbitrary a
+          , Arbitrary b
+          , Arbitrary c
+@@ -102,12 +95,3 @@ instance ( Arbitrary a
+          , Arbitrary o
+          ) => Arbitrary (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o) where
+     arbitrary = genericArbitrary
+-
+--- TODO: Replace these instances with generic-deriving
+-#if !(MIN_VERSION_base(4,16,0))
+-deriving instance Generic (a, b, c, d, e, f, g, h, i, j, k)
+-deriving instance Generic (a, b, c, d, e, f, g, h, i, j, k, l)
+-deriving instance Generic (a, b, c, d, e, f, g, h, i, j, k, l, m)
+-deriving instance Generic (a, b, c, d, e, f, g, h, i, j, k, l, m, n)
+-deriving instance Generic (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o)
+-#endif
+diff --git a/text-show.cabal b/text-show.cabal
+index 3f91853..1d9bb27 100644
+--- a/text-show.cabal
++++ b/text-show.cabal
+@@ -345,7 +345,7 @@ test-suite spec
+                      , bytestring            >= 0.9    && < 0.12
+                      , bytestring-builder
+                      , deriving-compat       >= 0.5.6  && < 1
+-                     , generic-deriving      >= 1.11   && < 2
++                     , generic-deriving      >= 1.14.1 && < 2
+                      , ghc-prim
+                      , hspec                 >= 2      && < 3
+                      , QuickCheck            >= 2.12   && < 2.15