diff --git a/srcpkgs/stack/patches/aeson.patch b/srcpkgs/stack/patches/aeson.patch new file mode 100644 index 00000000000..68f267c30cc --- /dev/null +++ b/srcpkgs/stack/patches/aeson.patch @@ -0,0 +1,46 @@ +commit 09e233ed73aa3335642f97c080ef27e42047c527 +Author: q66 +Date: Fri Mar 11 04:37:15 2022 +0100 + + constrain aeson to prevent build failures + +diff --git a/stack.cabal b/stack.cabal +index dba5bf0..0195f2c 100644 +--- a/stack.cabal ++++ b/stack.cabal +@@ -231,7 +231,7 @@ library + + build-depends: + Cabal >=3.2.1.0, +- aeson >=1.5.6.0, ++ aeson >=1.5.6.0 && <1.6, + annotated-wl-pprint >=0.7.0, + ansi-terminal >=0.10.3, + array >=0.5.4.0, +@@ -357,7 +357,7 @@ executable stack + + build-depends: + Cabal >=3.2.1.0, +- aeson >=1.5.6.0, ++ aeson >=1.5.6.0 && <1.6, + annotated-wl-pprint >=0.7.0, + ansi-terminal >=0.10.3, + array >=0.5.4.0, +@@ -485,7 +485,7 @@ executable stack-integration-test + + build-depends: + Cabal >=3.2.1.0, +- aeson >=1.5.6.0, ++ aeson >=1.5.6.0 && <1.6, + annotated-wl-pprint >=0.7.0, + ansi-terminal >=0.10.3, + array >=0.5.4.0, +@@ -621,7 +621,7 @@ test-suite stack-test + build-depends: + Cabal >=3.2.1.0, + QuickCheck >=2.14.2, +- aeson >=1.5.6.0, ++ aeson >=1.5.6.0 && <1.6, + annotated-wl-pprint >=0.7.0, + ansi-terminal >=0.10.3, + array >=0.5.4.0, diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template index f9d573ef5bf..9e53b95ca63 100644 --- a/srcpkgs/stack/template +++ b/srcpkgs/stack/template @@ -1,8 +1,8 @@ # Template file for 'stack' pkgname=stack -version=2.7.3 +version=2.7.5 revision=1 -_stackage="lts-18.5" +_stackage="lts-18.14" hostmakedepends="cabal-install pkg-config unzip" makedepends="zlib-devel pcre-devel" depends="git gmp-devel iana-etc" @@ -12,8 +12,8 @@ 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}" -checksum="47caf8818352c7f663eb0364f48b1f4d80832ae25c31ca483416a4b74c2c5b44 - 322bc85f38bf6726af6e588dde381d72f0c3e89970939b6a7b5b975cabd05d1a" +checksum="9ddd44c2a62e9404194d69e7dc1c94e707910620316b66d6ac0b3201a8f37e80 + 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f" skip_extraction="cabal.config-${_stackage}" nocross=yes nopie_files="/usr/bin/stack"