From c0e0a8bea9bb29fe5364c1eaeb710aa36fb8ca39 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 14 Jun 2019 12:11:10 -0700
Subject: [PATCH 1/4] Ignore some revisions and close #4628

---
 build-constraints.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index fa37b7ba..243405c7 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4671,9 +4671,6 @@ packages:
 
         # https://github.com/commercialhaskell/stackage/issues/4619
         - hw-balancedparens < 0.2.1.0
-
-        # https://github.com/commercialhaskell/stackage/issues/4628
-        - stack < 2.1.1
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of
@@ -5816,6 +5813,8 @@ no-revisions:
 - foundation
 - gauge
 - stack
+- http-download
+- pantry-tmp
 # https://github.com/commercialhaskell/stackage/issues/3706:
 - hledger
 - hledger-lib

From 09ebd2b047b1451c744c918b65f14bf96db167d3 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 14 Jun 2019 12:32:49 -0700
Subject: [PATCH 2/4] Add some new Stack deps

---
 build-constraints.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 243405c7..8ad70aaf 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -566,6 +566,11 @@ packages:
         - http-conduit
         - githash
 
+        - pantry-tmp
+        - http-download
+        - hi-file-parser
+        - rio-prettyprint
+
     "Omari Norman <omari@smileystation.com> @massysett":
         - rainbow
         - rainbox
@@ -5815,6 +5820,8 @@ no-revisions:
 - stack
 - http-download
 - pantry-tmp
+- rio-prettyprint
+- hi-file-parser
 # https://github.com/commercialhaskell/stackage/issues/3706:
 - hledger
 - hledger-lib

From 4ab4608d6d446efc062482fedc80964b42455cf1 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 14 Jun 2019 12:34:34 -0700
Subject: [PATCH 3/4] Missing grandfathered package

---
 build-constraints.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build-constraints.yaml b/build-constraints.yaml
index 8ad70aaf..116007a0 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -4256,6 +4256,7 @@ packages:
         - system-filepath
         - tabular
         - tar
+        - tasty-lua
         - tasty-th
         - tdigest
         - temporary

From c5c9e0ea215f8e8507a64b72dc10781150199ca5 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 16 Jun 2019 05:23:18 -0700
Subject: [PATCH 4/4] Use Stack 1.9.3 in the build script (unpack
 compatibility)

---
 automated/build.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/automated/build.sh b/automated/build.sh
index c2b21131..48046dae 100755
--- a/automated/build.sh
+++ b/automated/build.sh
@@ -94,8 +94,9 @@ then
   docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "exec stackage-curator check-target-available --target $TARGET"
 fi
 
-# Get latest stack
-curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C $EXTRA_BIN_DIR '*/stack'
+# Get latest compatible stack
+curl -L https://github.com/commercialhaskell/stack/releases/download/v1.9.3/stack-1.9.3-linux-x86_64-static.tar.gz | tar xz --wildcards --strip-components=1 -C $EXTRA_BIN_DIR '*/stack'
+
 
 # Determine the new build plan unless NOPLAN is set
 #