From 624d967d3ef07952135b679fbdd2bdd5b55f85c5 Mon Sep 17 00:00:00 2001
From: Mike Pilgrem <mpilgrem@users.noreply.github.com>
Date: Wed, 7 Dec 2022 19:12:10 +0000
Subject: [PATCH] Fix Hpack #530

For the context to this pull request, see see [Hpack issue #530](https://github.com/sol/hpack/issues/530), the [Hpack PR #531](https://github.com/sol/hpack/pull/531) and the alternative [Hpack PR #535](https://github.com/sol/hpack/pull/535) (on which this PR builds). See also [Pantry PR #74](https://github.com/commercialhaskell/pantry/pull/74) (on which this PR builds).
---
 stack.yaml      |  9 ++++++++-
 stack.yaml.lock | 23 +++++++++++++++++++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/stack.yaml b/stack.yaml
index 06b69e7efa..0574d607c3 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -5,7 +5,14 @@ packages:
 - .
 
 extra-deps:
-- pantry-0.8.0@sha256:351a9103c0b1dd78f6b8f243ca4fc6a6952d5ba00f72032b831e5ee0e61dce0f,4099
+# Temporarily relying on test versions of 'hpack' and 'pantry':
+# Modified hpack
+- git: https://github.com/sol/hpack
+  commit: 1ecc4158bdfc03609c88d0b1908fa9f41fdfbf5c
+# Modified pantry in branch 'fix-hpack530'
+- git: https://github.com/commercialhaskell/pantry/
+  commit: 6c90ce38597d84f32bb3c048ae227d17ecf64493
+# - pantry-0.8.0@sha256:351a9103c0b1dd78f6b8f243ca4fc6a6952d5ba00f72032b831e5ee0e61dce0f,4099
 - rio-prettyprint-0.1.4.0@sha256:1f8eb3ead0ef33d3736d53e1de5e9b2c91a0c207cdca23321bd74c401e85f23a,1301
 - fsnotify-0.4.1.0@sha256:44540beabea36aeeef930aa4d5f28091d431904bc9923b6ac4d358831c651235,2854
 
diff --git a/stack.yaml.lock b/stack.yaml.lock
index 7b80231f7e..f293405a6a 100644
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -5,12 +5,27 @@
 
 packages:
 - completed:
-    hackage: pantry-0.8.0@sha256:351a9103c0b1dd78f6b8f243ca4fc6a6952d5ba00f72032b831e5ee0e61dce0f,4099
+    commit: 1ecc4158bdfc03609c88d0b1908fa9f41fdfbf5c
+    git: https://github.com/sol/hpack
+    name: hpack
     pantry-tree:
-      sha256: a5f0a90f33a78e3c92f3c13335f870fe83f20c45296cda9c279042b7c451a310
-      size: 2524
+      sha256: 48c9aaf36bb594e3893b4730e4862dd6d84da49713b7fa8985451df29582e1cf
+      size: 4378
+    version: 0.35.0
   original:
-    hackage: pantry-0.8.0@sha256:351a9103c0b1dd78f6b8f243ca4fc6a6952d5ba00f72032b831e5ee0e61dce0f,4099
+    commit: 1ecc4158bdfc03609c88d0b1908fa9f41fdfbf5c
+    git: https://github.com/sol/hpack
+- completed:
+    commit: 6c90ce38597d84f32bb3c048ae227d17ecf64493
+    git: https://github.com/commercialhaskell/pantry/
+    name: pantry
+    pantry-tree:
+      sha256: fd9588148b70c3ca0828cc95682e2d90352730c12c7e296c448cd2bc955730b4
+      size: 3621
+    version: 0.8.0
+  original:
+    commit: 6c90ce38597d84f32bb3c048ae227d17ecf64493
+    git: https://github.com/commercialhaskell/pantry/
 - completed:
     hackage: rio-prettyprint-0.1.4.0@sha256:1f8eb3ead0ef33d3736d53e1de5e9b2c91a0c207cdca23321bd74c401e85f23a,1301
     pantry-tree: