summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex J. Malozemoff2018-11-26 13:30:44 -0800
committerAlex J. Malozemoff2018-11-26 13:30:44 -0800
commitf5544234caef9313b07c3cbaabfb3ca8da254147 (patch)
tree1d561a2cee833ec19e967c71d0bcf850364f0826
parent5668a105441d021f925bc4d3a6af2bd40449ca15 (diff)
downloadaur-f5544234caef9313b07c3cbaabfb3ca8da254147.tar.gz
matterhorn-git v50200
Old build stopped working with latest `ghc`, so uses `ghc8.0` for now.
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD25
2 files changed, 16 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b9d6b6061f1f..196832f83465 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
pkgbase = matterhorn-git
pkgdesc = A terminal-based chat client for MatterMost
- pkgver = 30802.1.0
- pkgrel = 2
+ pkgver = 50200.0.0
+ pkgrel = 1
url = https://github.com/matterhorn-chat/matterhorn
arch = x86_64
license = BSD
makedepends = git
makedepends = cabal-install
- makedepends = ghc
- makedepends = happy
+ makedepends = ghc8.0
provides = matterhorn
+ conflicts = matterhorn
+ conflicts = matterhorn-bin
source = matterhorn::git+https://github.com/matterhorn-chat/matterhorn.git
- source = mattermost-api::git+https://github.com/matterhorn-chat/mattermost-api.git
- md5sums = SKIP
- md5sums = SKIP
+ sha1sums = SKIP
pkgname = matterhorn-git
diff --git a/PKGBUILD b/PKGBUILD
index 939a9036e81f..236020732b5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,39 +2,34 @@
pkgname=matterhorn-git
_pkgname=matterhorn
-pkgver=30802.1.0
+pkgver=50200.0.0
pkgver() {
cd "$_pkgname"
git describe --long --tags | cut -d- -f1
}
-pkgrel=2
+pkgrel=1
pkgdesc='A terminal-based chat client for MatterMost'
arch=('x86_64')
url="https://github.com/matterhorn-chat/matterhorn"
license=('BSD')
-makedepends=('git' 'cabal-install' 'ghc' 'happy')
-source=("$_pkgname::git+https://github.com/matterhorn-chat/matterhorn.git"
- "mattermost-api::git+https://github.com/matterhorn-chat/mattermost-api.git")
-md5sums=('SKIP'
- 'SKIP')
+makedepends=('git' 'cabal-install' 'ghc8.0')
+source=("$_pkgname::git+https://github.com/matterhorn-chat/matterhorn.git")
+sha1sums=('SKIP')
provides=('matterhorn')
-conficts=('matterhorn')
+conflicts=('matterhorn' 'matterhorn-bin')
build() {
cd "$srcdir/$_pkgname"
- cabal update
- cabal sandbox init
- cabal sandbox add-source "$srcdir/mattermost-api"
- cabal install --force-reinstalls
- cabal build $_pkgname
+ git submodule update --init
+ cabal new-update
+ cabal new-build -w /usr/bin/ghc-8.0
}
package() {
cd "$srcdir/$_pkgname"
mkdir -p $pkgdir/usr/bin
mkdir -p $pkgdir/usr/share/licenses/$_pkgname
- cp dist/build/matterhorn/matterhorn $pkgdir/usr/bin
+ cp $(find . -name $_pkgname -type f) $pkgdir/usr/bin
cp LICENSE $pkgdir/usr/share/licenses/$_pkgname
}
-