Date: Sunday, February 17, 2019 @ 16:56:19 Author: felixonmars Revision: 434119
upgpkg: haskell-chell-quickcheck 0.2.5.2-1 rebuild with chell 0.5, chell-quickcheck 0.2.5.2 Modified: haskell-chell-quickcheck/trunk/PKGBUILD Deleted: haskell-chell-quickcheck/trunk/quickcheck-2.12.patch -----------------------+ PKGBUILD | 17 ++++---------- quickcheck-2.12.patch | 57 ------------------------------------------------ 2 files changed, 5 insertions(+), 69 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-02-17 16:55:44 UTC (rev 434118) +++ PKGBUILD 2019-02-17 16:56:19 UTC (rev 434119) @@ -2,24 +2,17 @@ _hkgname=chell-quickcheck pkgname=haskell-chell-quickcheck -pkgver=0.2.5.1 -pkgrel=17 +pkgver=0.2.5.2 +pkgrel=1 pkgdesc="QuickCheck support for the Chell testing library" -url="https://john-millikin.com/software/chell/"; +url="https://github.com/typeclasses/chell"; license=('MIT') arch=('x86_64') depends=('ghc-libs' 'haskell-chell' 'haskell-quickcheck' 'haskell-random') makedepends=('ghc') -source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz - quickcheck-2.12.patch) -sha512sums=('4879c084731112e0e17e6d82510850c119c7e5e5cde90c03ecce9ea470f94429ddd040b9346a5aa268b0ea41c5656025cc2dacfe533d370efd7162473a1ebc6e' - '9ace27b5b047c6b03f24fc88d907b699381d7ae334ac6f774ed28a39499b179f86dfc8ea7f7cae55b67ca1066741bd5333bb162f94346009dd30aa204842343b') +source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +sha512sums=('d17b8aeb19adc08debdfccaeceabb480fcbf82ba47c5e805f326f26be8c3266b741c52ab1ab13042b13aaa865ae355812ff067f3a46ff8186cef232143fa8efa') -prepare() { - cd $_hkgname-$pkgver - patch -p2 -i ../quickcheck-2.12.patch -} - build() { cd $_hkgname-$pkgver Deleted: quickcheck-2.12.patch =================================================================== --- quickcheck-2.12.patch 2019-02-17 16:55:44 UTC (rev 434118) +++ quickcheck-2.12.patch 2019-02-17 16:56:19 UTC (rev 434119) @@ -1,57 +0,0 @@ -commit bab1bd78ff47da389e7f35153eb6ba93e4f5e685 -Author: Felix Yan <[email protected]> -Date: Mon Jan 21 01:15:45 2019 +0800 - - Fix compatibility with QuickCheck 2.12 - -diff --git a/chell-quickcheck/Test/Chell/QuickCheck.hs b/chell-quickcheck/Test/Chell/QuickCheck.hs -index 0ec25b0..aaf35fb 100644 ---- a/chell-quickcheck/Test/Chell/QuickCheck.hs -+++ b/chell-quickcheck/Test/Chell/QuickCheck.hs -@@ -53,8 +53,16 @@ property name prop = Chell.test name $ \opts -> do - , State.computeSize = computeSize (QuickCheck.maxSize args) (QuickCheck.maxSuccess args) - , State.numSuccessTests = 0 - , State.numDiscardedTests = 0 -+#if MIN_VERSION_QuickCheck(2,12,0) -+ , State.classes = mempty -+ , State.tables = mempty -+ , State.requiredCoverage = mempty -+ , State.expected = True -+ , State.coverageConfidence = Nothing -+#else - , State.collected = [] - , State.expectedFailure = False -+#endif - - #if MIN_VERSION_QuickCheck(2,7,0) - , State.randomSeed = QCRandom.mkQCGen seed -@@ -77,12 +85,16 @@ property name prop = Chell.test name $ \opts -> do - #endif - } - -+#if MIN_VERSION_QuickCheck(2,12,0) -+ result <- Test.test state (QuickCheck.property prop) -+#else - #if MIN_VERSION_QuickCheck(2,7,0) - let genProp = unProperty (QuickCheck.property prop) - #else - let genProp = QuickCheck.property prop - #endif - result <- Test.test state (Gen.unGen genProp) -+#endif - let output = Test.output result - let notes = [("seed", show seed)] - let failure = Chell.failure { Chell.failureMessage = output } -diff --git a/chell-quickcheck/chell-quickcheck.cabal b/chell-quickcheck/chell-quickcheck.cabal -index 5b5482c..673363e 100644 ---- a/chell-quickcheck/chell-quickcheck.cabal -+++ b/chell-quickcheck/chell-quickcheck.cabal -@@ -27,7 +27,7 @@ library - build-depends: - base >= 4.0 && < 5.0 - , chell >= 0.3 && < 0.5 -- , QuickCheck >= 2.3 && < 2.11 -+ , QuickCheck >= 2.3 && < 2.13 - , random - - exposed-modules:
