Date: Thursday, December 21, 2017 @ 13:39:36 Author: felixonmars Revision: 275175
upgpkg: stack 1.6.1.1-1 rebuild with unliftio,0.2.1.0 Modified: stack/trunk/PKGBUILD Deleted: stack/trunk/smallcheck-1.1.3.patch ------------------------+ PKGBUILD | 12 ++++-------- smallcheck-1.1.3.patch | 24 ------------------------ 2 files changed, 4 insertions(+), 32 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-12-21 13:33:00 UTC (rev 275174) +++ PKGBUILD 2017-12-21 13:39:36 UTC (rev 275175) @@ -3,8 +3,8 @@ # Contributor: Arch Haskell Team <[email protected]> pkgname=stack -pkgver=1.6.1 -pkgrel=14 +pkgver=1.6.1.1 +pkgrel=1 pkgdesc="The Haskell Tool Stack" url="https://github.com/commercialhaskell/stack"; license=("custom:BSD3") @@ -33,15 +33,11 @@ conflicts=('haskell-stack') replaces=('haskell-stack') install="stack.install" -source=("$pkgname-$pkgver.tar.gz::https://github.com/commercialhaskell/stack/archive/v$pkgver.tar.gz"; - smallcheck-1.1.3.patch) -sha512sums=('b798945388f533768d0a14961b0b5fceb0bb3d24b4995fc6e86f9ee3d182782b7930edb6a61c028ae62b7ea72b61937396474813f83c5ae796353dcf9e6f36d7' - '63f15a0644ebab8e91aca67ab825bc4fb126cced17554d81fa291e794c016205596f6612a9831bde83f74b485925bfab80aa4275fca3960680dd14d2f7a3e40b') +source=("$pkgname-$pkgver.tar.gz::https://github.com/commercialhaskell/stack/archive/v$pkgver.tar.gz";) +sha512sums=('92a54f99ad544ada168c439cd9b95fbc5212faffdfb407f4bffa1539df134eed2fa5a1f5bed1883c622cc1f2338b897f9e26890bc51c767efe8e963e79368129') prepare() { cd $pkgname-$pkgver - patch -p1 -i ../smallcheck-1.1.3.patch - hpack } Deleted: smallcheck-1.1.3.patch =================================================================== --- smallcheck-1.1.3.patch 2017-12-21 13:33:00 UTC (rev 275174) +++ smallcheck-1.1.3.patch 2017-12-21 13:39:36 UTC (rev 275175) @@ -1,24 +0,0 @@ -diff --git a/src/test/Stack/StoreSpec.hs b/src/test/Stack/StoreSpec.hs -index 72534b44..27413e0d 100644 ---- a/src/test/Stack/StoreSpec.hs -+++ b/src/test/Stack/StoreSpec.hs -@@ -6,6 +6,7 @@ - {-# LANGUAGE TemplateHaskell #-} - {-# LANGUAGE ScopedTypeVariables #-} - {-# LANGUAGE OverloadedStrings #-} -+{-# LANGUAGE CPP #-} - module Stack.StoreSpec where - - import qualified Data.ByteString as BS -@@ -51,7 +52,11 @@ addMinAndMaxBounds xs = - (if (minBound :: a) `notElem` xs then [minBound] else []) ++ - (if (maxBound :: a) `notElem` xs && (maxBound :: a) /= minBound then maxBound : xs else xs) - -+#if MIN_VERSION_smallcheck(1,1,3) -+$(do let ns = [ ''Int64, ''Word64, ''Word8 -+#else - $(do let ns = [ ''Int64, ''Word64, ''Word, ''Word8 -+#endif - ] - f n = [d| instance Monad m => Serial m $(conT n) where - series = generate (\_ -> addMinAndMaxBounds [0, 1]) |]
