From 8475a079470bd43cf49ed56526b3e07e8f86bd18 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 12 Apr 2017 15:33:46 +0200 Subject: [PATCH] stack: update to 1.4.0. --- common/build-style/haskell-stack.sh | 7 ++++--- srcpkgs/stack/template | 15 ++++++++------- srcpkgs/stack/update | 2 -- 3 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 srcpkgs/stack/update diff --git a/common/build-style/haskell-stack.sh b/common/build-style/haskell-stack.sh index 9b4f0ec4bd..f09acd1ab3 100644 --- a/common/build-style/haskell-stack.sh +++ b/common/build-style/haskell-stack.sh @@ -17,11 +17,12 @@ do_build() { stack init --force --resolver ${stackage} fi - STACK_ROOT=$wrksrc/.stack stack ${makejobs} build ${make_build_args} + STACK_ROOT=$wrksrc/.stack stack --system-ghc ${makejobs} build \ + ${make_build_args} } do_install() { vmkdir usr/bin - STACK_ROOT=$wrksrc/.stack stack install ${make_build_args} \ - --local-bin-path=${DESTDIR}/usr/bin + STACK_ROOT=$wrksrc/.stack stack --system-ghc install \ + ${make_build_args} --local-bin-path=${DESTDIR}/usr/bin } diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template index 944b6228af..c54a7d0b61 100644 --- a/srcpkgs/stack/template +++ b/srcpkgs/stack/template @@ -1,27 +1,28 @@ # Template file for 'stack' pkgname=stack -version=1.1.2 -revision=2 -_stackage="lts-6.17" +version=1.4.0 +revision=1 +_stackage="lts-8.9" hostmakedepends="cabal-install pkg-config" makedepends="zlib-devel pcre-devel" depends="git iana-etc" short_desc="Cross-platform program for developing Haskell projects" -maintainer="Christian Neukirchen " +maintainer="Leah Neukirchen " license="BSD-3" homepage="http://haskellstack.org" distfiles="https://github.com/commercialhaskell/stack/archive/v${version}.tar.gz https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}" skip_extraction="cabal.config-${_stackage}" -checksum="8f43d69a00a8861b156705a634e55179524cefbd98e6c29182e7bdcb57d8b3be - 2fe4734c6033257966c0f8beba7420e003286498c97326d313ded0ae9f5cc9eb" +checksum="595d311ad117e41ad908b7065743917542b40f343d1334673e98171ee74d36e6 + 05c840d29192fc45d71b1b6d3be852f07903648f9f4993fc6c91759a0f97e204" nocross=yes nopie=yes # network-2.6.2.1 build fails with a relocation do_build() { cabal sandbox init cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/cabal.config-${_stackage} cabal.config - sed -i 's/Cabal ==.*/Cabal ==1.24.0.0,/' cabal.config # XXX hack for cabal-install + sed -i 's/ store ==.*/ store ==0.3.1,/' cabal.config + sed -i 's/ store-core ==.*/ store-core ==0.3,/' cabal.config cabal update cabal install ${makejobs} --only-dependencies cabal install ${makejobs} cpphs diff --git a/srcpkgs/stack/update b/srcpkgs/stack/update deleted file mode 100644 index fdd634612c..0000000000 --- a/srcpkgs/stack/update +++ /dev/null @@ -1,2 +0,0 @@ -site='http://www.stackage.org/lts' -pattern='package/stack-\K[\d.]+'