From a94fd343f3c9cb9bed42de6768c8f0c329fe1522 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 11 Dec 2019 22:40:38 +0100 Subject: [PATCH] stack: fix build The hackage-security dependency is not versioned in 'pantry', and the recently released 0.6.0.0 hid Hackage.Security.Util.Lens which pantry depends on. --- srcpkgs/stack/template | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template index bbf83e952ba..27a7124c9bb 100644 --- a/srcpkgs/stack/template +++ b/srcpkgs/stack/template @@ -11,13 +11,21 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://haskellstack.org" distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz - https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}" + https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage} + http://hackage.haskell.org/package/pantry-0.2.0.0/pantry-0.2.0.0.tar.gz" checksum="f983369a22a3e3af9ae09770cf34e4ba439cc7f5ef5a0e87f4db11c1ec5356e0 - c077d34ebe0b5139f57492770c7fd1dabb4b81df0ed842e6ca30b002d9fe78ec" + c077d34ebe0b5139f57492770c7fd1dabb4b81df0ed842e6ca30b002d9fe78ec + 8cd8b4192c0a1e37666852306d588a6db03ea03363572e0e54e0e8a9aa19e2e2" skip_extraction="cabal.config-${_stackage}" nocross=yes nopie_files="/usr/bin/stack" +post_extract() { + mv ../pantry-0.2.0.0 . + vsed -e 's/hackage-security/hackage-security <0.6.0.0/g' -i pantry-0.2.0.0/pantry.cabal + vsed -e 's/^- \./&\n- pantry-0.2.0.0/' -i stack.yaml +} + do_build() { cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/cabal.config-${_stackage} cabal.config HOME=$PWD cabal v2-update