Date: Friday, March 3, 2023 @ 00:29:39
Author: felixonmars
Revision: 1408408
archrelease: copy trunk to community-staging-x86_64
Added:
haskell-hspec-contrib/repos/community-staging-x86_64/
haskell-hspec-contrib/repos/community-staging-x86_64/PKGBUILD
(from rev 1408406, haskell-hspec-contrib/trunk/PKGBUILD)
haskell-hspec-contrib/repos/community-staging-x86_64/hspec-2.10-2.patch
(from rev 1408406, haskell-hspec-contrib/trunk/hspec-2.10-2.patch)
haskell-hspec-contrib/repos/community-staging-x86_64/hspec-2.10.patch
(from rev 1408406, haskell-hspec-contrib/trunk/hspec-2.10.patch)
--------------------+
PKGBUILD | 42 ++++++++++++++++++++++++++++++++++++++++++
hspec-2.10-2.patch | 22 ++++++++++++++++++++++
hspec-2.10.patch | 26 ++++++++++++++++++++++++++
3 files changed, 90 insertions(+)
Copied: haskell-hspec-contrib/repos/community-staging-x86_64/PKGBUILD (from rev
1408406, haskell-hspec-contrib/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2023-03-03 00:29:39 UTC (rev 1408408)
@@ -0,0 +1,42 @@
+# Maintainer: Felix Yan <[email protected]>
+
+_hkgname=hspec-contrib
+pkgname=haskell-hspec-contrib
+pkgver=0.5.2
+pkgrel=3
+pkgdesc="Contributed functionality for Hspec"
+url="https://hspec.github.io/";
+license=('MIT')
+arch=('x86_64')
+depends=('ghc-libs' 'haskell-hspec-core' 'haskell-hunit')
+makedepends=('ghc' 'haskell-hspec' 'haskell-hspec-discover'
'haskell-quickcheck')
+source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
+sha512sums=('2d3e5e87820fdfcd9a4ed41a754ac54ca962229b965d89b22bc61f923ba7b55553aa8aa8da5c8c45d2cc3a9043b8adbcb06fe21ad2e7008108c063fb9198e12f')
+
+build() {
+ cd $_hkgname-$pkgver
+
+ runhaskell Setup configure -O --enable-shared --enable-executable-dynamic
--disable-library-vanilla \
+ --prefix=/usr --docdir=/usr/share/doc/$pkgname --datasubdir=$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-hspec-contrib/repos/community-staging-x86_64/hspec-2.10-2.patch
(from rev 1408406, haskell-hspec-contrib/trunk/hspec-2.10-2.patch)
===================================================================
--- community-staging-x86_64/hspec-2.10-2.patch (rev 0)
+++ community-staging-x86_64/hspec-2.10-2.patch 2023-03-03 00:29:39 UTC (rev
1408408)
@@ -0,0 +1,22 @@
+From a50d17b3c2c8bfa6aa79975bdffb5a749aee910b Mon Sep 17 00:00:00 2001
+From: Simon Hengel <[email protected]>
+Date: Sat, 9 Jan 2021 12:25:35 +0700
+Subject: [PATCH] refactoring: Use bimapForest instead of bimapTree
+
+---
+ hspec-contrib/test/Test/Hspec/Contrib/HUnitSpec.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hspec-contrib/test/Test/Hspec/Contrib/HUnitSpec.hs
b/hspec-contrib/test/Test/Hspec/Contrib/HUnitSpec.hs
+index bd44505b..1c2a234a 100644
+--- a/hspec-contrib/test/Test/Hspec/Contrib/HUnitSpec.hs
++++ b/hspec-contrib/test/Test/Hspec/Contrib/HUnitSpec.hs
+@@ -8,7 +8,7 @@ import Test.Hspec.Contrib.HUnit
+ import Test.HUnit
+
+ shouldYield :: Test -> [Tree () String] -> Expectation
+-a `shouldYield` b = map (bimapTree (const ()) itemRequirement) <$> runSpecM
(fromHUnitTest a) `shouldReturn` b
++a `shouldYield` b = bimapForest (const ()) itemRequirement <$> runSpecM
(fromHUnitTest a) `shouldReturn` b
+
+ spec :: Spec
+ spec = do
Copied: haskell-hspec-contrib/repos/community-staging-x86_64/hspec-2.10.patch
(from rev 1408406, haskell-hspec-contrib/trunk/hspec-2.10.patch)
===================================================================
--- community-staging-x86_64/hspec-2.10.patch (rev 0)
+++ community-staging-x86_64/hspec-2.10.patch 2023-03-03 00:29:39 UTC (rev
1408408)
@@ -0,0 +1,26 @@
+From f8edd52b3e4886108105a0fb551a0af5c0d84f63 Mon Sep 17 00:00:00 2001
+From: Simon Hengel <[email protected]>
+Date: Thu, 9 Dec 2021 15:13:00 +0700
+Subject: [PATCH] Allow to transform the config in SpecM
+
+---
+ .../test/Test/Hspec/Contrib/HUnitSpec.hs | 2 +-
+ hspec-core/src/Test/Hspec/Core/Runner.hs | 90 ++++++++++++++-----
+ hspec-core/src/Test/Hspec/Core/Spec/Monad.hs | 21 ++++-
+ hspec-core/test/Test/Hspec/Core/HooksSpec.hs | 7 +-
+ hspec-core/test/Test/Hspec/Core/SpecSpec.hs | 6 +-
+ 5 files changed, 97 insertions(+), 29 deletions(-)
+
+diff --git a/hspec-contrib/test/Test/Hspec/Contrib/HUnitSpec.hs
b/hspec-contrib/test/Test/Hspec/Contrib/HUnitSpec.hs
+index 1c2a234a..4ac53777 100644
+--- a/hspec-contrib/test/Test/Hspec/Contrib/HUnitSpec.hs
++++ b/hspec-contrib/test/Test/Hspec/Contrib/HUnitSpec.hs
+@@ -8,7 +8,7 @@ import Test.Hspec.Contrib.HUnit
+ import Test.HUnit
+
+ shouldYield :: Test -> [Tree () String] -> Expectation
+-a `shouldYield` b = bimapForest (const ()) itemRequirement <$> runSpecM
(fromHUnitTest a) `shouldReturn` b
++a `shouldYield` b = bimapForest (const ()) itemRequirement . snd <$> runSpecM
(fromHUnitTest a) `shouldReturn` b
+
+ spec :: Spec
+ spec = do
