summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Webb2015-08-14 16:10:57 -0700
committerTristan Webb2015-08-14 16:14:18 -0700
commit8035353e467522a84475be4963d7506badb89b36 (patch)
treee530fe2ec40a5e0cd0f63dc7c39eb060260c6e60
parent047a90eb7f46ce53baf2d60e228412ae9043cb03 (diff)
downloadaur-8035353e467522a84475be4963d7506badb89b36.tar.gz
Merged borsboom PR minus test hunk
-rw-r--r--PKGBUILD17
1 files changed, 10 insertions, 7 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 1f48366fe9a8..d7151f4143e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
# Maintainer: Tristan Webb <tristan@fpcomplete.com>
pkgname=haskell-stack-git
_pkgname=stack
-pkgver=0.1.3.1.r0.g908b042
+pkgver=0.1.3.1.r30.g9833f0d
pkgrel=1
pkgdesc="The Haskell Tool Stack"
arch=('i686' 'x86_64')
url="https://www.github.com/commercialhaskell/stack"
license=('BSD3')
depends=('libtinfo')
-makedepends=('ghc' 'haskell-stack')
+makedepends=('gcc' 'haskell-stack')
optdepends=('docker: Use Docker images to build your project in a temporary container')
provides=('haskell-stack')
conflicts=('haskell-stack')
@@ -27,7 +27,7 @@ build() {
STACK_ROOT=$srcdir
cd "$srcdir/${_pkgname}"
pwd
- stack build stack:stack --no-system-ghc
+ stack build --no-system-ghc
}
check() {
@@ -40,10 +40,13 @@ package() {
cd "$srcdir/${_pkgname}"
BIN_DIR=`stack path | grep "local-install-root" | cut -d ' ' -f2`/bin
STACK_BIN=$BIN_DIR/stack
- install -Dm755 $STACK_BIN "$pkgdir/usr/bin/stack"
- STACK_MAN_DIR=./man/man1
- gzip -k $STACK_MAN_DIR/stack.1
- install -Dm755 $STACK_MAN_DIR/stack.1.gz "$pkgdir/$STACK_MAN_DIR/stack.1.gz"
+ install -Dm755 $STACK_BIN "$pkgdir/usr/bin/stack"
+ #STACK_MAN_DIR=./man/man1
+ #gzip -k $STACK_MAN_DIR/stack.1
+ #install -Dm644 $STACK_MAN_DIR/stack.1.gz "$pkgdir/$STACK_MAN_DIR/stack.1.gz"
+ BASH_COMPLETION_DIR=etc/bash_completion.d
+ mkdir -p $pkgdir/$BASH_COMPLETION_DIR
+ $BIN_DIR/stack --bash-completion-script /usr/bin/stack >$pkgdir/$BASH_COMPLETION_DIR/stack
}
pkgver() {