From 46ec759e6f2d9de01c534e404e8aea21aeee8003 Mon Sep 17 00:00:00 2001
From: Paolo Capriotti <paolo@capriotti.io>
Date: Mon, 6 Sep 2021 09:12:04 +0200
Subject: [PATCH 1/3] Fix snappy linker issue

This selects a snappy branch containing a fix for a linker issue with
libsnappy-1.1.9. The fix is in this PR:
https://github.com/bos/snappy/pull/7
---
 stack.yaml      |  7 +++++--
 stack.yaml.lock | 18 +++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/stack.yaml b/stack.yaml
index 9c2b6a95c83..e39daebbcc5 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -139,7 +139,6 @@ extra-deps:
 # Dropped from upstream snapshot
 - template-0.2.0.10
 - HaskellNet-0.5.2
-- snappy-0.2.0.2
 - smtp-mail-0.2.0.0
 - stm-containers-1.1.0.4 # Latest: lts-15.16
 - redis-resp-1.0.0
@@ -234,12 +233,16 @@ extra-deps:
   subdirs:
     - http2-client-grpc
 
-# Fix in for issue #27: https://github.com/kazu-yamamoto/http2/issues/27
+# Fix for issue #27: https://github.com/kazu-yamamoto/http2/issues/27
 # PR here: https://github.com/kazu-yamamoto/http2/pull/28
 # Note: the commit used here is based on version 2.0.6 of http2
 - git: https://github.com/wireapp/http2 # (2021-06-09) branch: header-encoding-0-size-table-backport
   commit: 7c465be1201e0945b106f7cc6176ac1b1193be13
 
+# Fix in PR: https://github.com/bos/snappy/pull/7
+- git: https://github.com/wireapp/snappy
+  commit: b0e5c08af48911caecffa4fa6a3e74872018b258 # master (Sep 03, 2021)
+
 ############################################################
 # Development tools
 ############################################################
diff --git a/stack.yaml.lock b/stack.yaml.lock
index 7fec0d171fb..e17149372df 100644
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -316,13 +316,6 @@ packages:
       sha256: 20f0361675729e606fb37b8a1865f4bd49d952f2d0148693b62f68fadf5801d5
   original:
     hackage: HaskellNet-0.5.2
-- completed:
-    hackage: snappy-0.2.0.2@sha256:2931b03c5fdab2dac8d7eadb3be2f4ef8906666e43f1f1db65a06efd57ea701b,1591
-    pantry-tree:
-      size: 709
-      sha256: cd05c6ddfbbd3969adab3869d38d161e5ec8e72b1a72e00ca08f5e39538368cf
-  original:
-    hackage: snappy-0.2.0.2
 - completed:
     hackage: smtp-mail-0.2.0.0@sha256:b91c81f6dbb41a9ceee8c443385118684ecec55006b77f7d3c0e49cffd2468cf,1211
     pantry-tree:
@@ -792,6 +785,17 @@ packages:
   original:
     git: https://github.com/wireapp/http2
     commit: 7c465be1201e0945b106f7cc6176ac1b1193be13
+- completed:
+    name: snappy
+    version: 0.2.0.2
+    git: https://github.com/wireapp/snappy
+    pantry-tree:
+      size: 989
+      sha256: ae7fdf1988910fa026279052e85ade0a99962a3e7812ace104797e12ead0cd1d
+    commit: b0e5c08af48911caecffa4fa6a3e74872018b258
+  original:
+    git: https://github.com/wireapp/snappy
+    commit: b0e5c08af48911caecffa4fa6a3e74872018b258
 - completed:
     hackage: ormolu-0.1.4.1@sha256:ed404eac6e4eb64da1ca5fb749e0f99907431a9633e6ba34e44d260e7d7728ba,6499
     pantry-tree:

From 19c4afb88af7a1cdf00c364bc38d6ce1d6878ddc Mon Sep 17 00:00:00 2001
From: Paolo Capriotti <paolo@capriotti.io>
Date: Mon, 6 Sep 2021 09:15:53 +0200
Subject: [PATCH 2/3] Update CHANGELOG

---
 CHANGELOG-draft.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG-draft.md b/CHANGELOG-draft.md
index 1ae1625657d..ec8e375eb1c 100644
--- a/CHANGELOG-draft.md
+++ b/CHANGELOG-draft.md
@@ -49,6 +49,7 @@ THIS FILE ACCUMULATES THE RELEASE NOTES FOR THE UPCOMING RELEASE.
 * The `DELETE /conversations/:cnv/members/:usr` endpoint rewritten to Servant (#1697)
 * Remove leftover auto-connect internal endpoint and code (#1716)
 * Clean up JSON golden tests (#1729)
+* Import fix for snappy linker issue (#1736)
 
 ## Federation changes
 

From be7b3a13dab11a47cbbd2123d47894737a96ce23 Mon Sep 17 00:00:00 2001
From: Paolo Capriotti <paolo@capriotti.io>
Date: Mon, 6 Sep 2021 11:51:44 +0200
Subject: [PATCH 3/3] Hi CI