Date: Friday, May 14, 2021 @ 23:37:46 Author: felixonmars Revision: 934464
upgpkg: haskell-tasty-discover 4.2.2-74: rebuild with hspec 2.8.0, hspec-core 2.8.0, hspec-discover 2.8.0, tasty-hspec 1.1.7 Added: haskell-tasty-discover/trunk/tasty-hspec-1.1.7.patch Modified: haskell-tasty-discover/trunk/PKGBUILD -------------------------+ PKGBUILD | 19 ++++++++---- tasty-hspec-1.1.7.patch | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-05-14 23:14:52 UTC (rev 934463) +++ PKGBUILD 2021-05-14 23:37:46 UTC (rev 934464) @@ -3,17 +3,24 @@ _hkgname=tasty-discover pkgname=haskell-tasty-discover pkgver=4.2.2 -pkgrel=73 +pkgrel=74 pkgdesc="Test discovery for the tasty framework" -url="http://git.coop/lwm/tasty-discover" +url="https://github.com/haskell-works/tasty-discover" license=('MIT') arch=('x86_64') depends=('ghc-libs' 'haskell-glob') -makedepends=('ghc' 'haskell-hedgehog' 'haskell-tasty' 'haskell-tasty-hedgehog' 'haskell-tasty-hspec' - 'haskell-tasty-hunit' 'haskell-tasty-quickcheck' 'haskell-tasty-smallcheck') -source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -sha512sums=('42a0d9c79e3c80780fbf65b9069586d908eaea8cdad62b35120369cfc1fa14f7155b8aba27356d6f454c6fb292bcd3f637ce59827795bdf5cce4e9ab5f9e7792') +makedepends=('ghc' 'haskell-hedgehog' 'haskell-hspec' 'haskell-tasty' 'haskell-tasty-hedgehog' + 'haskell-tasty-hspec' 'haskell-tasty-hunit' 'haskell-tasty-quickcheck' + 'haskell-tasty-smallcheck') +source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz + tasty-hspec-1.1.7.patch) +sha512sums=('42a0d9c79e3c80780fbf65b9069586d908eaea8cdad62b35120369cfc1fa14f7155b8aba27356d6f454c6fb292bcd3f637ce59827795bdf5cce4e9ab5f9e7792' + '396fec6196fabe5e12894a60e621b47eacb59d7effe7a1b4b9145be8acae4c0afc93a46d8495eea1dd8752195948c049e34d3260fedb9d10a425646a55b07acb') +prepare() { + patch -d $_hkgname-$pkgver -p1 < tasty-hspec-1.1.7.patch +} + build() { cd $_hkgname-$pkgver Added: tasty-hspec-1.1.7.patch =================================================================== --- tasty-hspec-1.1.7.patch (rev 0) +++ tasty-hspec-1.1.7.patch 2021-05-14 23:37:46 UTC (rev 934464) @@ -0,0 +1,69 @@ +commit a7323eb6d64a7b094fb7312cf089f9b6ac6ed7f4 +Author: Felix Yan <felixonm...@archlinux.org> +Date: Sat May 15 07:16:31 2021 +0800 + + Fix compatibility with tasty-hspec 1.1.7 + + tasty-hspec no longer re-exports Test.Hspec since 1.1.7. Let's import + it ourselves. + +diff --git a/tasty-discover.cabal b/tasty-discover.cabal +index 9e4be46..d8cd477 100644 +--- a/tasty-discover.cabal ++++ b/tasty-discover.cabal +@@ -39,6 +39,7 @@ common directory { build-depends: directory >= + common filepath { build-depends: filepath >= 1.3 && < 2.0 } + common Glob { build-depends: Glob >= 0.8 && < 1.0 } + common hedgehog { build-depends: hedgehog } ++common hspec { build-depends: hspec } + common tasty { build-depends: tasty } + common tasty-discover { build-depends: tasty-discover } + common tasty-hedgehog { build-depends: tasty-hedgehog } +@@ -82,6 +83,7 @@ test-suite tasty-discover-test + , directory + , filepath + , hedgehog ++ , hspec + , tasty + , tasty-hedgehog + , tasty-hspec +diff --git a/test/ConfigTest.hs b/test/ConfigTest.hs +index 7a52360..3a7bbe8 100644 +--- a/test/ConfigTest.hs ++++ b/test/ConfigTest.hs +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + {-# LANGUAGE TupleSections #-} + + {-# OPTIONS_GHC -fno-warn-orphans #-} +@@ -12,6 +13,10 @@ import Test.Tasty.Hspec + import Test.Tasty.HUnit + import Test.Tasty.QuickCheck + ++#if MIN_VERSION_tasty_hspec(1,1,7) ++import Test.Hspec ++#endif ++ + import qualified Data.Map.Strict as M + + spec_modules :: Spec +diff --git a/test/DiscoverTest.hs b/test/DiscoverTest.hs +index 8e6cc55..b79b6ed 100644 +--- a/test/DiscoverTest.hs ++++ b/test/DiscoverTest.hs +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + {-# LANGUAGE ScopedTypeVariables #-} + + module DiscoverTest where +@@ -8,6 +9,10 @@ import Test.Tasty.Hspec + import Test.Tasty.HUnit + import Test.Tasty.QuickCheck + ++#if MIN_VERSION_tasty_hspec(1,1,7) ++import Test.Hspec ++#endif ++ + import qualified Hedgehog as H + import qualified Hedgehog.Gen as G + import qualified Hedgehog.Range as R