From e6748e7e89cd44f4958954cc7955292c344497fb Mon Sep 17 00:00:00 2001 From: Matthias Heinzel Date: Mon, 17 Feb 2020 14:58:17 +0100 Subject: [PATCH] Stop using fork of amazonka (#976) * snapshots: add sha256 and size to wireapp/amazonka * pin amazonka to brendanhay/develop The two issues mentioned in our previous snapshot are closed now: https://github.com/brendanhay/amazonka/issues/466 https://github.com/brendanhay/amazonka/issues/490 --- snapshots/wire-2.0.yaml | 2 ++ snapshots/wire-2.1.yaml | 24 ++++++++++++++++++++++++ stack.yaml | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 snapshots/wire-2.1.yaml diff --git a/snapshots/wire-2.0.yaml b/snapshots/wire-2.0.yaml index c3bc211846b..7a657dac3d5 100644 --- a/snapshots/wire-2.0.yaml +++ b/snapshots/wire-2.0.yaml @@ -45,6 +45,8 @@ packages: # # The archive corresponds to commit 52896fd46ef6812708e9e4d7456becc692698f6b. - archive: https://github.com/wireapp/amazonka/archive/wire-2019-01-25.tar.gz + sha256: b1cecd0e5e17cd41395ec56e4f6926e0c8bbeef493ff3a575bf7561b72db0525 + size: 11128501 subdirs: - amazonka - core diff --git a/snapshots/wire-2.1.yaml b/snapshots/wire-2.1.yaml new file mode 100644 index 00000000000..057d5182856 --- /dev/null +++ b/snapshots/wire-2.1.yaml @@ -0,0 +1,24 @@ +# DO NOT MODIFY THIS FILE. See README.md to learn why. + +resolver: https://raw.githubusercontent.com/wireapp/wire-server/develop/snapshots/wire-2.0.yaml +name: wire-2.1 + +packages: +# amazonka-1.6.1 is buggy: https://github.com/brendanhay/amazonka/issues/466 +# Therefore we pin an unreleased commit directly. +# +# More precisely, we pull just some libraries out of it, +# the other packages weren't changed between 1.6.1 and this commit, +# so we can use Stackage-supplied versions for them. +# See https://github.com/brendanhay/amazonka/compare/1.6.1...9cf5b5777b69ac494d23d43a692294882927df34 +# +# Once there has been made a new hackage release, we can use that instead. +- archive: https://github.com/brendanhay/amazonka/archive/9cf5b5777b69ac494d23d43a692294882927df34.tar.gz + sha256: c3044f803a7652aee88fe600a97321175cdc1443d671246ba7ff78e14bf5b49f + size: 11137527 + subdirs: + - amazonka + - amazonka-elb + - amazonka-redshift + - amazonka-route53 + - core diff --git a/stack.yaml b/stack.yaml index cf7f3f5892e..c123f917911 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: snapshots/wire-2.0.yaml +resolver: snapshots/wire-2.1.yaml packages: - libs/api-bot