Date: Tuesday, December 19, 2017 @ 05:44:23 Author: felixonmars Revision: 274853
upgpkg: stack 1.6.1-13 rebuild with smallcheck,1.1.3 Added: stack/trunk/smallcheck-1.1.3.patch Modified: stack/trunk/PKGBUILD ------------------------+ PKGBUILD | 17 +++++++++++------ smallcheck-1.1.3.patch | 24 ++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-12-19 04:45:04 UTC (rev 274852) +++ PKGBUILD 2017-12-19 05:44:23 UTC (rev 274853) @@ -4,7 +4,7 @@ pkgname=stack pkgver=1.6.1 -pkgrel=12 +pkgrel=13 pkgdesc="The Haskell Tool Stack" url="https://github.com/commercialhaskell/stack"; license=("custom:BSD3") @@ -29,14 +29,19 @@ 'haskell-unix-compat' 'haskell-unliftio' 'haskell-unordered-containers' 'haskell-vector' 'haskell-yaml' 'haskell-zip-archive' 'haskell-zlib') makedepends=('ghc' 'haskell-quickcheck' 'haskell-hspec' 'haskell-smallcheck') +checkdepends=('cabal-install') conflicts=('haskell-stack') replaces=('haskell-stack') install="stack.install" -source=("$pkgname-$pkgver.tar.gz::https://github.com/commercialhaskell/stack/archive/v$pkgver.tar.gz";) -sha512sums=('b798945388f533768d0a14961b0b5fceb0bb3d24b4995fc6e86f9ee3d182782b7930edb6a61c028ae62b7ea72b61937396474813f83c5ae796353dcf9e6f36d7') +source=("$pkgname-$pkgver.tar.gz::https://github.com/commercialhaskell/stack/archive/v$pkgver.tar.gz"; + smallcheck-1.1.3.patch) +sha512sums=('b798945388f533768d0a14961b0b5fceb0bb3d24b4995fc6e86f9ee3d182782b7930edb6a61c028ae62b7ea72b61937396474813f83c5ae796353dcf9e6f36d7' + '63f15a0644ebab8e91aca67ab825bc4fb126cced17554d81fa291e794c016205596f6612a9831bde83f74b485925bfab80aa4275fca3960680dd14d2f7a3e40b') prepare() { cd $pkgname-$pkgver + patch -p1 -i ../smallcheck-1.1.3.patch + hpack } @@ -46,7 +51,7 @@ 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 \ - -f-disable-git-info -f-integration-tests -f-static -f-hide-dependency-versions -f-supported-build + -f-disable-git-info -fintegration-tests -f-static -f-hide-dependency-versions -f-supported-build runhaskell Setup build runhaskell Setup register --gen-script runhaskell Setup unregister --gen-script @@ -56,8 +61,8 @@ check() { cd $pkgname-$pkgver - PATH="$PWD/dist/build/stack:$PATH" runhaskell Setup test - # TODO: need more work for integration tests + cabal update + LD_LIBRARY_PATH="$PWD"/dist/build PATH="$PWD"/dist/build/stack:"$PATH" runhaskell Setup test || warning "Expected 4 failures on Arch currently" } package() { Added: smallcheck-1.1.3.patch =================================================================== --- smallcheck-1.1.3.patch (rev 0) +++ smallcheck-1.1.3.patch 2017-12-19 05:44:23 UTC (rev 274853) @@ -0,0 +1,24 @@ +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]) |]
