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

[Felix Yan]

    Date: Tuesday, January 4, 2022 @ 19:34:32
  Author: felixonmars
Revision: 1093036

upgpkg: haskell-text-show 3.9.2-1: rebuild with text-show 3.9.2

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

-------------------------------------------------+
 PKGBUILD                                        |   11 +---
 haskell-text-show-generic-deriving-1.14.1.patch |   59 ----------------------
 2 files changed, 4 insertions(+), 66 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-04 18:50:02 UTC (rev 1093035)
+++ PKGBUILD	2022-01-04 19:34:32 UTC (rev 1093036)
@@ -2,8 +2,8 @@
 
 _hkgname=text-show
 pkgname=haskell-text-show
-pkgver=3.9.1
-pkgrel=14
+pkgver=3.9.2
+pkgrel=1
 pkgdesc="Efficient conversion of values into Text"
 url="https://github.com/RyanGlScott/text-show"
 license=('BSD')
@@ -12,14 +12,11 @@
          '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
-        $pkgname-generic-deriving-1.14.1.patch)
-sha512sums=('5e9f4f1bac52073171b5f95e79d91d03cbc28c748eae061d1193bd71a4f0f7463838d60d32e8c4b04d4f225fc33af160995f3b1843d16f0bbbe02afb63690a7d'
-            '328567f99dbac0952f4d006eec9e85bb762457339b988b815d1a28785c48c89ca5dab6103f7ac496d046dd41c0ffc1e5457f2e072e70eea910327ce9b7076445')
+source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+sha512sums=('d8c8f424b13b6cae29eb7fe602afd14eb6f32bfab9f0edb5884bb5453d402d76bf6b0015a1e47386b7839bba43071d6ccd427da38498eb6289de9154e9d1d225')
 
 prepare() {
     cd $_hkgname-$pkgver
-    patch -p1 -i ../$pkgname-generic-deriving-1.14.1.patch
     sed -i -e '/bytestring-builder/d' $_hkgname.cabal
 }
 

Deleted: haskell-text-show-generic-deriving-1.14.1.patch
===================================================================
--- haskell-text-show-generic-deriving-1.14.1.patch	2022-01-04 18:50:02 UTC (rev 1093035)
+++ haskell-text-show-generic-deriving-1.14.1.patch	2022-01-04 19:34:32 UTC (rev 1093036)
@@ -1,59 +0,0 @@
-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