Date: Monday, November 29, 2021 @ 02:52:11 Author: felixonmars Revision: 1056233
archrelease: copy trunk to community-staging-x86_64 Added: haskell-text-show/repos/community-staging-x86_64/ haskell-text-show/repos/community-staging-x86_64/PKGBUILD (from rev 1056232, haskell-text-show/trunk/PKGBUILD) haskell-text-show/repos/community-staging-x86_64/haskell-text-show-generic-deriving-1.14.1.patch (from rev 1056232, haskell-text-show/trunk/haskell-text-show-generic-deriving-1.14.1.patch) -------------------------------------------------+ PKGBUILD | 52 +++++++++++++++++++ haskell-text-show-generic-deriving-1.14.1.patch | 59 ++++++++++++++++++++++ 2 files changed, 111 insertions(+) Copied: haskell-text-show/repos/community-staging-x86_64/PKGBUILD (from rev 1056232, haskell-text-show/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2021-11-29 02:52:11 UTC (rev 1056233) @@ -0,0 +1,52 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +_hkgname=text-show +pkgname=haskell-text-show +pkgver=3.9.1 +pkgrel=7 +pkgdesc="Efficient conversion of values into Text" +url="https://github.com/RyanGlScott/text-show" +license=('BSD') +arch=('x86_64') +depends=('ghc-libs' 'haskell-base-compat-batteries' 'haskell-bifunctors' 'haskell-generic-deriving' + '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') + +prepare() { + cd $_hkgname-$pkgver + patch -p1 -i ../$pkgname-generic-deriving-1.14.1.patch + sed -i -e '/bytestring-builder/d' $_hkgname.cabal +} + +build() { + cd $_hkgname-$pkgver + + runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ + --prefix=/usr --docdir=/usr/share/doc/$pkgname --enable-tests \ + --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid --ghc-option=-fllvm + runhaskell Setup build $MAKEFLAGS + 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 +} + +check() { + cd $_hkgname-$pkgver + runhaskell Setup test --show-details=direct +} + +package() { + cd $_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 "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE +} Copied: haskell-text-show/repos/community-staging-x86_64/haskell-text-show-generic-deriving-1.14.1.patch (from rev 1056232, haskell-text-show/trunk/haskell-text-show-generic-deriving-1.14.1.patch) =================================================================== --- community-staging-x86_64/haskell-text-show-generic-deriving-1.14.1.patch (rev 0) +++ community-staging-x86_64/haskell-text-show-generic-deriving-1.14.1.patch 2021-11-29 02:52:11 UTC (rev 1056233) @@ -0,0 +1,59 @@ +From 3a78fcfe82786c228173f402b41dcfa116a9b54c Mon Sep 17 00:00:00 2001 +From: Ryan Scott <ryan.gl.sc...@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