From 953489dc5402769d7cf9fde07b727c30ec0d6fb6 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Wed, 9 Jun 2021 10:27:25 +0200 Subject: [PATCH 1/4] Import http2 fix --- stack.yaml | 5 +++++ stack.yaml.lock | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/stack.yaml b/stack.yaml index 065c9350760..cf6c009143f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -229,6 +229,11 @@ extra-deps: subdirs: - http2-client-grpc +# Fix in branch header-encoding-0-size-table-backport for issue #27 +# Note: the patch for #27 is based on version 2.0.6 of http2 +- git: https://github.com/wireapp/http2 + commit: 7c465be1201e0945b106f7cc6176ac1b1193be13 + ############################################################ # Development tools ############################################################ diff --git a/stack.yaml.lock b/stack.yaml.lock index 2eec1d39671..097a1ec7239 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -767,6 +767,17 @@ packages: subdir: http2-client-grpc git: https://github.com/akshaymankar/http2-grpc-haskell commit: 43507d54515cd5870e8f6d1f03b4d23e6cd460e2 +- completed: + name: http2 + version: 2.0.6 + git: https://github.com/wireapp/http2 + pantry-tree: + size: 51601 + sha256: 0a048cf85ab9614f2da80e3a8cf72ee7674cecea86b37a5e56011add73e5fa03 + commit: 7c465be1201e0945b106f7cc6176ac1b1193be13 + original: + git: https://github.com/wireapp/http2 + commit: 7c465be1201e0945b106f7cc6176ac1b1193be13 - completed: hackage: ormolu-0.1.4.1@sha256:ed404eac6e4eb64da1ca5fb749e0f99907431a9633e6ba34e44d260e7d7728ba,6499 pantry-tree: From cbe537119ca85f89189dfb8ce06a87fc96a86438 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Wed, 9 Jun 2021 13:27:27 +0200 Subject: [PATCH 2/4] Make branch name more prominent --- stack.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stack.yaml b/stack.yaml index cf6c009143f..d66cb8cf76c 100644 --- a/stack.yaml +++ b/stack.yaml @@ -229,9 +229,9 @@ extra-deps: subdirs: - http2-client-grpc -# Fix in branch header-encoding-0-size-table-backport for issue #27 -# Note: the patch for #27 is based on version 2.0.6 of http2 -- git: https://github.com/wireapp/http2 +# Fix in for issue #27 +# Note: the patch 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 ############################################################ From 3cd88d1da22290a936ddb10698ddaecbd6b57b04 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Wed, 9 Jun 2021 13:29:06 +0200 Subject: [PATCH 3/4] Add link to issue --- stack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack.yaml b/stack.yaml index d66cb8cf76c..40c6d2304d7 100644 --- a/stack.yaml +++ b/stack.yaml @@ -229,7 +229,7 @@ extra-deps: subdirs: - http2-client-grpc -# Fix in for issue #27 +# Fix in for issue #27: https://github.com/kazu-yamamoto/http2/issues/27 # Note: the patch 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 From f9d53fc464a555fd232348a8f861804edea18196 Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Wed, 9 Jun 2021 13:52:11 +0200 Subject: [PATCH 4/4] Add link to http2 PR in a comment --- stack.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stack.yaml b/stack.yaml index 40c6d2304d7..18f169303c3 100644 --- a/stack.yaml +++ b/stack.yaml @@ -230,7 +230,8 @@ extra-deps: - http2-client-grpc # Fix in for issue #27: https://github.com/kazu-yamamoto/http2/issues/27 -# Note: the patch is based on version 2.0.6 of http2 +# 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