From 2c77f4d4f6889ab39dff3cf317caac1cae14c01c Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Mon, 14 Sep 2015 16:14:08 +0200 Subject: [PATCH] darcs: build_style=haskell-stack, and bump to lts-3.5. --- srcpkgs/darcs/files/stack.yaml | 2 +- srcpkgs/darcs/template | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml index 591a1669b1b..28d6d38545a 100644 --- a/srcpkgs/darcs/files/stack.yaml +++ b/srcpkgs/darcs/files/stack.yaml @@ -4,4 +4,4 @@ packages: extra-deps: - dataenc-0.12 - regex-compat-tdfa-0.95.1.4 -resolver: lts-3.0 +resolver: lts-3.5 diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template index 9b85b1f0150..0db51fdbc2c 100644 --- a/srcpkgs/darcs/template +++ b/srcpkgs/darcs/template @@ -1,8 +1,10 @@ # Template file for 'darcs' pkgname=darcs version=2.10.1 -revision=1 +revision=2 nocross=yes +build_style=haskell-stack +make_build_args="--flag darcs:use-time-1point5" hostmakedepends="ghc stack" makedepends="zlib-devel libcurl-devel ncurses-devel" short_desc="Change-focused cross-platform version control system" @@ -12,15 +14,6 @@ homepage="http://darcs.net/" distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz" checksum=f1ef65b43780e7593ca1afdae5ecf44ed91d62cc1be360693a52c5ff7b57ee94 -do_build() { - export STACK_ROOT=$wrksrc/.stack - cp ${FILESDIR}/stack.yaml . - stack ${makejobs} build --flag darcs:use-time-1point5 -} - -do_install() { - export STACK_ROOT=$wrksrc/.stack - vmkdir usr/bin - stack install --flag darcs:use-time-1point5 --local-bin-path=${DESTDIR}/usr/bin +post_install() { vinstall contrib/darcs_completion 644 etc/bash_completion.d }