<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/05945e4f88d59a8a2a1bc460fa27b63721cd5f04">https://github.com/macports/macports-ports/commit/05945e4f88d59a8a2a1bc460fa27b63721cd5f04</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 05945e4f88d stack: Update to version rc/v2.7.0.1
</span>05945e4f88d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 05945e4f88d59a8a2a1bc460fa27b63721cd5f04
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sun Apr 25 12:26:28 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> stack: Update to version rc/v2.7.0.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Related:
</span><span style='display:block; white-space:pre;color:#404040;'> * https://trac.macports.org/ticket/61422
</span><span style='display:block; white-space:pre;color:#404040;'> * commercialhaskell/stack#5456
</span><span style='display:block; white-space:pre;color:#404040;'> * commercialhaskell/stack#5491
</span><span style='display:block; white-space:pre;color:#404040;'> * https://github.com/macports/macports-ports/pull/10086
</span>---
lang/stack/Portfile | 76 ++++++++++++++++++++++++++++++-----------------------
1 file changed, 43 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/stack/Portfile b/lang/stack/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7985dd5a3d6..504f4f15601 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/stack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/stack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,8 @@ PortGroup github 1.0
</span> PortGroup gpg_verify 1.0
PortGroup haskell_stack 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup commercialhaskell stack 2.5.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup commercialhaskell stack 2.7.0.1 rc/v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version ${github.version}.[lindex [split ${github.tag_prefix} /] 0]
</span> revision 0
name stack
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,41 +16,48 @@ license BSD
</span> platforms darwin
description The Haskell Tool Stack
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Stack is a cross-platform command line interface\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for developing Haskell projects. It features:\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installing GHC automatically, installing packages\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- needed for your project, building your project,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testing your project, benchmarking your project.\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- It is intended for Haskellers both new and\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- experienced.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Stack is a cross-platform command line interface \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for developing Haskell projects. It features: \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installing GHC automatically, installing packages \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ needed for your project, building your project, \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ testing your project, benchmarking your project. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ It is intended for Haskellers both new and experienced.
</span>
homepage https://haskellstack.org
variant prebuilt \
description {Do not bootstrap stack; install the pre-built binary.} {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# workaround for stack bootstrap issue; remove after this issue is resolved
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/commercialhaskell/stack/issues/5491
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +prebuilt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> distname ${name}-${github.version}-osx-x86_64
worksrcdir ${name}-${github.version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set worksrcpath_prebuilt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/${distname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set github_tag_prefix_quote \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {rc%2Fv}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${github.homepage}/releases/download/v${github.version}:release \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${github.homepage}/archive:archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${github.homepage}/releases/download/${github_tag_prefix_quote}${github.version}:release \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${github.homepage}/archive/refs/tags/[lindex [split ${github.tag_prefix} /] 0]/:archive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${distname}${extract.suffix}:release \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- v${github.version}${extract.suffix}:archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${distname}-bin:release \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [lindex [split ${github.tag_prefix} /] 1]${github.version}${extract.suffix}:archive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3634157a25bf329370e26c76d8d8fca96f8721d4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f4aedfa8fbe371f77286ee97ec5c3c553842e7ae15b2952a8b8442dccba04bf0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8032226 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- v${github.version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9d47c92ae94a961cdc4f35b08793c1f31df7906f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 684865 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${distname}${extract.suffix}.asc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.only [lindex [split ${github.tag_prefix} /] 1]${github.version}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${distname}-bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3c858ee4ee7c1b64c59be3ef23a8d3641873dfe7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 813e673f63b544edcd7cb5f4772b6952c2f8df518f79b913600036bed66b3f5a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 33467768 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [lindex [split ${github.tag_prefix} /] 1]${github.version}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 fcaf9e12522fe21e1369ad656079d6fdc1ba6149 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 440fd140ad5e64aaeb3f61032f511cdb4be6e361af71f2b77445206433acd8a5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 686876 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distname}-bin.asc \
</span> size 488
gpg_verify.use_gpg_verification \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +65,7 @@ gpg_verify.use_gpg_verification \
</span>
if {[option gpg_verify.use_gpg_verification]} {
distfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${distname}${extract.suffix}.asc:release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distname}-bin.asc:release
</span>
post-checksum {
# check GPG signature: https://docs.haskellstack.org/en/stable/SIGNING_KEY/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,12 +73,15 @@ if {[option gpg_verify.use_gpg_verification]} {
</span>
gpg_verify.verify_gpg_signature \
${filespath}/keyid-${gpg_keyid}.txt \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${distpath}/${distname}${extract.suffix}.asc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${distpath}/${distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distpath}/${distname}-bin.asc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distpath}/${distname}-bin
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -W ${workpath} -d ./bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -W ${distpath} ./${distname}-bin ${workpath}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if { [variant_isset "prebuilt"] } {
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,8 +89,8 @@ if { [variant_isset "prebuilt"] } {
</span> build {}
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -W ${workpath}/${distname} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ./${name} ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${workpath}/bin/${distname}-bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/${name}
</span> }
} else {
post-extract {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,10 +98,9 @@ if { [variant_isset "prebuilt"] } {
</span>
# standard stack install with 'curl | sh'; don't use
# system -W ${worksrcpath} "/bin/mkdir ./bin && /usr/bin/curl -sSL https://get.haskellstack.org/ | /bin/sh -s - -d ./bin"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # copy the pre-built ./stack binary to ./bin, then bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -W ${workpath} -d ./bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -W ${worksrcpath_prebuilt} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ./${name} ${workpath}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # bootstrap using the pre-built ./stack binary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${workpath}/bin/${distname}-bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/bin/${name}
</span> }
set haskell_stack.bin ${workpath}/bin/stack
</pre><pre style='margin:0'>
</pre>