net-im/matterhorn: Update to 50200.10.1 and fix the build with new GHC.

Reported by:	pkg-fallout

3 files changed, 64 insertions, 73 deletions

diff --git a/net-im/matterhorn/Makefile b/net-im/matterhorn/Makefile
index 978c0c889127..e22d9dcb0baf 100644
--- a/net-im/matterhorn/Makefile
+++ b/net-im/matterhorn/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	matterhorn
-PORTVERSION=	50200.9.0
+PORTVERSION=	50200.10.1
 CATEGORIES=	net-im
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -16,8 +16,13 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	matterhorn-chat
 GH_PROJECT=	matterhorn
 
-USE_CABAL=	aeson-1.4.7.1_1 \
-		ansi-terminal-0.10.3 \
+USE_CABAL=	HTTP-4000.3.14_1 \
+		Hclip-3.0.0.4 \
+		QuickCheck-2.14.1 \
+		SHA-1.6.4.4 \
+		StateVar-1.2 \
+		aeson-1.4.7.1_1 \
+		ansi-terminal-0.11 \
 		asn1-encoding-0.9.6_1 \
 		asn1-parse-0.9.5 \
 		asn1-types-0.3.4 \
@@ -29,14 +34,14 @@ USE_CABAL=	aeson-1.4.7.1_1 \
 		base-orphans-0.8.2 \
 		base64-bytestring-1.1.0.0 \
 		basement-0.0.11_2 \
-		bifunctors-5.5.7 \
+		bifunctors-5.5.7_1 \
 		blaze-builder-0.4.1.0 \
 		blaze-html-0.9.1.2 \
-		blaze-markup-0.8.2.5 \
-		brick-0.53 \
+		blaze-markup-0.8.2.7 \
+		brick-0.55_1 \
 		brick-skylighting-0.3 \
 		bytestring-builder-0.10.8.2.0 \
-		cabal-doctest-1.0.8_1 \
+		cabal-doctest-1.0.8_2 \
 		case-insensitive-1.2.1.0 \
 		cereal-0.5.8.1 \
 		cheapskate-0.1.1.2_1 \
@@ -48,7 +53,7 @@ USE_CABAL=	aeson-1.4.7.1_1 \
 		contravariant-1.5.2 \
 		cryptohash-md5-0.11.100.1_5 \
 		cryptohash-sha1-0.11.100.1_5 \
-		cryptonite-0.26 \
+		cryptonite-0.27 \
 		css-text-0.1.3.0 \
 		data-clist-0.1.2.3_1 \
 		data-default-0.7.1.1 \
@@ -56,7 +61,7 @@ USE_CABAL=	aeson-1.4.7.1_1 \
 		data-default-instances-containers-0.0.1 \
 		data-default-instances-dlist-0.0.1 \
 		data-default-instances-old-locale-0.0.1 \
-		distributive-0.6.2_1 \
+		distributive-0.6.2_2 \
 		dlist-0.8.0.8 \
 		entropy-0.4.1.6 \
 		extensible-exceptions-0.1.1.4 \
@@ -64,17 +69,15 @@ USE_CABAL=	aeson-1.4.7.1_1 \
 		happy-1.19.12 \
 		hashable-1.3.0.0_1 \
 		haskell-lexer-1.1 \
-		Hclip-3.0.0.4 \
 		hourglass-0.2.12 \
 		hsc2hs-0.68.7 \
-		HTTP-4000.3.14_1 \
 		http-media-0.8.0.0_3 \
 		hxt-9.3.1.18 \
 		hxt-charproperties-9.4.0.0 \
 		hxt-regex-xmlschema-9.2.0.3_1 \
 		hxt-unicode-9.0.2.4 \
 		integer-logarithms-1.0.3_2 \
-		mattermost-api-50200.6.0 \
+		mattermost-api-50200.7.0 \
 		megaparsec-8.0.0 \
 		memory-0.15.0_1 \
 		microlens-0.4.11.2 \
@@ -84,7 +87,7 @@ USE_CABAL=	aeson-1.4.7.1_1 \
 		microlens-th-0.4.3.5 \
 		modern-uri-0.3.2.0_1 \
 		monad-control-1.0.2.3 \
-		network-3.1.1.1 \
+		network-3.1.2.0_1 \
 		network-info-0.2.0.10_1 \
 		network-uri-2.6.3.0 \
 		old-locale-1.0.0.7_2 \
@@ -92,9 +95,8 @@ USE_CABAL=	aeson-1.4.7.1_1 \
 		parser-combinators-1.2.1 \
 		pem-0.2.4 \
 		pretty-show-1.10 \
-		primitive-0.7.0.1 \
+		primitive-0.7.1.0 \
 		profunctors-5.5.2 \
-		QuickCheck-2.14_1 \
 		random-1.1_1 \
 		reflection-2.1.6 \
 		regex-base-0.94.0.0_1 \
@@ -103,14 +105,12 @@ USE_CABAL=	aeson-1.4.7.1_1 \
 		safe-0.3.19 \
 		scientific-0.3.6.2 \
 		semigroups-0.19.1 \
-		SHA-1.6.4.4 \
 		skylighting-core-0.8.5 \
 		socks-0.6.1 \
 		split-0.2.3.4 \
-		splitmix-0.0.5 \
-		StateVar-1.2 \
+		splitmix-0.1.0.1 \
 		stm-delay-0.1.1.1 \
-		streaming-commons-0.2.1.2 \
+		streaming-commons-0.2.2.1 \
 		strict-0.3.2 \
 		syb-0.7.1 \
 		tagged-0.8.6_2 \
@@ -125,12 +125,12 @@ USE_CABAL=	aeson-1.4.7.1_1 \
 		transformers-base-0.4.5.2 \
 		transformers-compat-0.6.5 \
 		uniplate-1.6.12_1 \
-		unordered-containers-0.2.11.0 \
+		unordered-containers-0.2.12.0 \
 		utf8-string-1.0.1.1_3 \
 		uuid-1.3.13_3 \
-		uuid-types-1.0.3_2 \
+		uuid-types-1.0.3_3 \
 		vector-0.12.1.2 \
-		vty-5.28.2 \
+		vty-5.30 \
 		websockets-0.12.7.1 \
 		word-wrap-0.4.1_1 \
 		x509-1.7.5_1 \
@@ -139,7 +139,7 @@ USE_CABAL=	aeson-1.4.7.1_1 \
 		x509-validation-1.6.11 \
 		xdg-basedir-0.2.2 \
 		xss-sanitize-0.3.6 \
-		zlib-0.6.2.1_1
+		zlib-0.6.2.2
 
 post-extract:
 	${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/cabal.project
diff --git a/net-im/matterhorn/distinfo b/net-im/matterhorn/distinfo
index fe4e86b16fe3..596131d68269 100644
--- a/net-im/matterhorn/distinfo
+++ b/net-im/matterhorn/distinfo
@@ -1,14 +1,12 @@
-TIMESTAMP = 1592667282
+TIMESTAMP = 1598191592
 SHA256 (cabal/HTTP-4000.3.14/HTTP-4000.3.14.tar.gz) = a602d7f30e917164c6a634f8cb1f5df4849048858db01380a0875e16e5aa687b
 SIZE (cabal/HTTP-4000.3.14/HTTP-4000.3.14.tar.gz) = 72938
 SHA256 (cabal/HTTP-4000.3.14/revision/1.cabal) = 3c19975fdfd8d057eae58847bda6a79514ad882fd6f8ead72ac0247af34bdfc6
 SIZE (cabal/HTTP-4000.3.14/revision/1.cabal) = 5843
 SHA256 (cabal/Hclip-3.0.0.4/Hclip-3.0.0.4.tar.gz) = d8c80bd2d035571cd76ce4f69453e9fcef4096dbc8868eb4cfcd7eb74fe5f712
 SIZE (cabal/Hclip-3.0.0.4/Hclip-3.0.0.4.tar.gz) = 3843
-SHA256 (cabal/QuickCheck-2.14/QuickCheck-2.14.tar.gz) = 52be1407fb19f5f3b5aa06d41fac745536d08306adaf6dde46a62255d16c384a
-SIZE (cabal/QuickCheck-2.14/QuickCheck-2.14.tar.gz) = 73915
-SHA256 (cabal/QuickCheck-2.14/revision/1.cabal) = 3f536a4b86bef7ec39025f04ef8d76c5ac5a78ba0b42e660b25d0a8f9c811045
-SIZE (cabal/QuickCheck-2.14/revision/1.cabal) = 7004
+SHA256 (cabal/QuickCheck-2.14.1/QuickCheck-2.14.1.tar.gz) = c3fcc5aa18dabe2d1cebbdf3f0a91daf239b52eb086d02b7c615c607ef0d4757
+SIZE (cabal/QuickCheck-2.14.1/QuickCheck-2.14.1.tar.gz) = 73248
 SHA256 (cabal/SHA-1.6.4.4/SHA-1.6.4.4.tar.gz) = 6bd950df6b11a3998bb1452d875d2da043ee43385459afc5f16d471d25178b44
 SIZE (cabal/SHA-1.6.4.4/SHA-1.6.4.4.tar.gz) = 2715144
 SHA256 (cabal/StateVar-1.2/StateVar-1.2.tar.gz) = afc036021fcd38f15fcc4af392a3e57017d5ddcc926e99391dbfc8c4e6375f8b
@@ -17,8 +15,8 @@ SHA256 (cabal/aeson-1.4.7.1/aeson-1.4.7.1.tar.gz) = 07e746655fd9bec81c59927c5617
 SIZE (cabal/aeson-1.4.7.1/aeson-1.4.7.1.tar.gz) = 277911
 SHA256 (cabal/aeson-1.4.7.1/revision/1.cabal) = 6d8d2fd959b7122a1df9389cf4eca30420a053d67289f92cdc0dbc0dab3530ba
 SIZE (cabal/aeson-1.4.7.1/revision/1.cabal) = 7098
-SHA256 (cabal/ansi-terminal-0.10.3/ansi-terminal-0.10.3.tar.gz) = fa2e2e32dfad29835aa7fd442bbe233e07d97e933223a001fe5efa562535b57c
-SIZE (cabal/ansi-terminal-0.10.3/ansi-terminal-0.10.3.tar.gz) = 35863
+SHA256 (cabal/ansi-terminal-0.11/ansi-terminal-0.11.tar.gz) = c6611b9e51add41db3f79eac30066c06b33a6ca2a09e586b4b361d7f98303793
+SIZE (cabal/ansi-terminal-0.11/ansi-terminal-0.11.tar.gz) = 36074
 SHA256 (cabal/asn1-encoding-0.9.6/asn1-encoding-0.9.6.tar.gz) = d9f8deabd3b908e5cf83c0d813c08dc0143b3ec1c0d97f660d2cfa02c1c8da0a
 SIZE (cabal/asn1-encoding-0.9.6/asn1-encoding-0.9.6.tar.gz) = 17343
 SHA256 (cabal/asn1-encoding-0.9.6/revision/1.cabal) = 3655d9a68c8c082e0d22f33456d968ad8c484d4e95308ad9217788b1c343d8a6
@@ -49,22 +47,26 @@ SHA256 (cabal/basement-0.0.11/revision/2.cabal) = af43e2e334e515b52ca309919b135c
 SIZE (cabal/basement-0.0.11/revision/2.cabal) = 5711
 SHA256 (cabal/bifunctors-5.5.7/bifunctors-5.5.7.tar.gz) = 88b3a2d4504e1139a3aef7027913faa0870631477d0a2ebb6fa67d494cdb3532
 SIZE (cabal/bifunctors-5.5.7/bifunctors-5.5.7.tar.gz) = 45689
+SHA256 (cabal/bifunctors-5.5.7/revision/1.cabal) = 179970d8cabaa760df74d40e1f81b3633c78b569f2d058e24dac31b5a1865406
+SIZE (cabal/bifunctors-5.5.7/revision/1.cabal) = 3423
 SHA256 (cabal/blaze-builder-0.4.1.0/blaze-builder-0.4.1.0.tar.gz) = 91fc8b966f3e9dc9461e1675c7566b881740f99abc906495491a3501630bc814
 SIZE (cabal/blaze-builder-0.4.1.0/blaze-builder-0.4.1.0.tar.gz) = 61365
 SHA256 (cabal/blaze-html-0.9.1.2/blaze-html-0.9.1.2.tar.gz) = 60503f42546c6c1b954014d188ea137e43d74dcffd2bf6157c113fd91a0c394c
 SIZE (cabal/blaze-html-0.9.1.2/blaze-html-0.9.1.2.tar.gz) = 81617
-SHA256 (cabal/blaze-markup-0.8.2.5/blaze-markup-0.8.2.5.tar.gz) = 1bd3ba68775e4a11efc71567e30e8ef3d27801c6b5fe4a1abf57dd747af37661
-SIZE (cabal/blaze-markup-0.8.2.5/blaze-markup-0.8.2.5.tar.gz) = 14529
-SHA256 (cabal/brick-0.53/brick-0.53.tar.gz) = b670980f867350efe5898b5938c998c9c7d5b1b61968e9e66892f5e10bd36996
-SIZE (cabal/brick-0.53/brick-0.53.tar.gz) = 694796
+SHA256 (cabal/blaze-markup-0.8.2.7/blaze-markup-0.8.2.7.tar.gz) = 8b6489ed422d98e4372f41be1f40f772b8d4ed925f3203b36be4078d918c8ee4
+SIZE (cabal/blaze-markup-0.8.2.7/blaze-markup-0.8.2.7.tar.gz) = 14571
+SHA256 (cabal/brick-0.55/brick-0.55.tar.gz) = de09e03e8223ed10d0bddcbb836726b5849b7f9a092ab7b05942952311dca158
+SIZE (cabal/brick-0.55/brick-0.55.tar.gz) = 695374
+SHA256 (cabal/brick-0.55/revision/1.cabal) = f98736eca0cd694837062e06da4655eed969d53b789dfd919716e9b6f5b4c5ce
+SIZE (cabal/brick-0.55/revision/1.cabal) = 15858
 SHA256 (cabal/brick-skylighting-0.3/brick-skylighting-0.3.tar.gz) = 2136854c33b61be45b9f962c5e73596ffd39d609f10af9d5799f1d969c2b54f2
 SIZE (cabal/brick-skylighting-0.3/brick-skylighting-0.3.tar.gz) = 6408
 SHA256 (cabal/bytestring-builder-0.10.8.2.0/bytestring-builder-0.10.8.2.0.tar.gz) = 27faef6db27c5be5a3715fd68b93725853e0e668849eaf92ce7c33cef9cb2c3f
 SIZE (cabal/bytestring-builder-0.10.8.2.0/bytestring-builder-0.10.8.2.0.tar.gz) = 47366
 SHA256 (cabal/cabal-doctest-1.0.8/cabal-doctest-1.0.8.tar.gz) = 2026a6a87d410202ce091412ca6bc33c5aca787025326b4a3d13425a23392e0e
 SIZE (cabal/cabal-doctest-1.0.8/cabal-doctest-1.0.8.tar.gz) = 10812
-SHA256 (cabal/cabal-doctest-1.0.8/revision/1.cabal) = 34dff6369d417df2699af4e15f06bc181d495eca9c51efde173deae2053c197c
-SIZE (cabal/cabal-doctest-1.0.8/revision/1.cabal) = 1491
+SHA256 (cabal/cabal-doctest-1.0.8/revision/2.cabal) = 8bd1d614fb65f0d52609da30bf8e5ec71a4b6adf8ff5610edb3cb4d114576117
+SIZE (cabal/cabal-doctest-1.0.8/revision/2.cabal) = 1491
 SHA256 (cabal/case-insensitive-1.2.1.0/case-insensitive-1.2.1.0.tar.gz) = 296dc17e0c5f3dfb3d82ced83e4c9c44c338ecde749b278b6eae512f1d04e406
 SIZE (cabal/case-insensitive-1.2.1.0/case-insensitive-1.2.1.0.tar.gz) = 53609
 SHA256 (cabal/cereal-0.5.8.1/cereal-0.5.8.1.tar.gz) = 2d9e88ac934b9ebc058097c72011ff59f3f146176310e1c957a0e4cf63681bd7
@@ -99,8 +101,8 @@ SHA256 (cabal/cryptohash-sha1-0.11.100.1/cryptohash-sha1-0.11.100.1.tar.gz) = 3c
 SIZE (cabal/cryptohash-sha1-0.11.100.1/cryptohash-sha1-0.11.100.1.tar.gz) = 10198
 SHA256 (cabal/cryptohash-sha1-0.11.100.1/revision/5.cabal) = 14d814cd88f5fd47641bef414668f3a5bba8b27fa8f960b1a6f4f2ba29265ee1
 SIZE (cabal/cryptohash-sha1-0.11.100.1/revision/5.cabal) = 4363
-SHA256 (cabal/cryptonite-0.26/cryptonite-0.26.tar.gz) = c47390df555295fdb1fb8161c190e208f43b8d334b2da3e96f0c64b7fe07aedd
-SIZE (cabal/cryptonite-0.26/cryptonite-0.26.tar.gz) = 581153
+SHA256 (cabal/cryptonite-0.27/cryptonite-0.27.tar.gz) = c82745a8930c36a81a0772dc18c86f8b7505e25fc2ab96b08c2f9125ece6c8b0
+SIZE (cabal/cryptonite-0.27/cryptonite-0.27.tar.gz) = 611768
 SHA256 (cabal/css-text-0.1.3.0/css-text-0.1.3.0.tar.gz) = 5ff507bf3863219f41e7f2d215e5511fe15ee13d1e28bd3ee64e0b0b894bcd7a
 SIZE (cabal/css-text-0.1.3.0/css-text-0.1.3.0.tar.gz) = 4594
 SHA256 (cabal/data-clist-0.1.2.3/data-clist-0.1.2.3.tar.gz) = 356910406b1615819fefd87ff50f425bc41bd935750cfaa567718fb8ab858ed7
@@ -119,8 +121,8 @@ SHA256 (cabal/data-default-instances-old-locale-0.0.1/data-default-instances-old
 SIZE (cabal/data-default-instances-old-locale-0.0.1/data-default-instances-old-locale-0.0.1.tar.gz) = 1519
 SHA256 (cabal/distributive-0.6.2/distributive-0.6.2.tar.gz) = 824ee271ded433ce6c61fe890c784642b7e20ffa4082fca609da54e7dcfc23c9
 SIZE (cabal/distributive-0.6.2/distributive-0.6.2.tar.gz) = 11308
-SHA256 (cabal/distributive-0.6.2/revision/1.cabal) = 1ad2369d4928a61a9fb8dc94b7ecc5f65a9296b07a51a2b4c397049115d82ed4
-SIZE (cabal/distributive-0.6.2/revision/1.cabal) = 3198
+SHA256 (cabal/distributive-0.6.2/revision/2.cabal) = 2ace9babcdbd1c2db28638c200405fb85e3660fe19ceae4f03082590adc2c487
+SIZE (cabal/distributive-0.6.2/revision/2.cabal) = 3198
 SHA256 (cabal/dlist-0.8.0.8/dlist-0.8.0.8.tar.gz) = 7129cf18068d3384e305708a10426ab8f573bee1030b023a114f45f1d0ec496d
 SIZE (cabal/dlist-0.8.0.8/dlist-0.8.0.8.tar.gz) = 9262
 SHA256 (cabal/entropy-0.4.1.6/entropy-0.4.1.6.tar.gz) = adc759ff756a6d71a450422ba511177632f43a33bf673901fd2334f53ef8bf62
@@ -159,8 +161,8 @@ SHA256 (cabal/integer-logarithms-1.0.3/integer-logarithms-1.0.3.tar.gz) = 5ae262
 SIZE (cabal/integer-logarithms-1.0.3/integer-logarithms-1.0.3.tar.gz) = 8840
 SHA256 (cabal/integer-logarithms-1.0.3/revision/2.cabal) = 63d42595ec92b71ac98a07b984b0a2eb3d4956f4ad2d856c3bf6fc3dc218d228
 SIZE (cabal/integer-logarithms-1.0.3/revision/2.cabal) = 2820
-SHA256 (cabal/mattermost-api-50200.6.0/mattermost-api-50200.6.0.tar.gz) = 4018958ba960f9f638736ae489e7842a91ca94bf820a521479b907ad61ca035c
-SIZE (cabal/mattermost-api-50200.6.0/mattermost-api-50200.6.0.tar.gz) = 80432
+SHA256 (cabal/mattermost-api-50200.7.0/mattermost-api-50200.7.0.tar.gz) = 17d1bc94b7f3a3022040c0ea3a535e2552e8cf25286fe6928289e258c1751bff
+SIZE (cabal/mattermost-api-50200.7.0/mattermost-api-50200.7.0.tar.gz) = 80314
 SHA256 (cabal/megaparsec-8.0.0/megaparsec-8.0.0.tar.gz) = b5d7c64646016d12f540a6948396a86e0cd39865569d68fe2018fe9e3fce6318
 SIZE (cabal/megaparsec-8.0.0/megaparsec-8.0.0.tar.gz) = 59692
 SHA256 (cabal/memory-0.15.0/memory-0.15.0.tar.gz) = e3ff892c1a94708954d0bb2c4f4ab81bc0f505352d95095319c462db1aeb3529
@@ -183,8 +185,10 @@ SHA256 (cabal/modern-uri-0.3.2.0/revision/1.cabal) = 602912a6524cd01c52df27bd90b
 SIZE (cabal/modern-uri-0.3.2.0/revision/1.cabal) = 4447
 SHA256 (cabal/monad-control-1.0.2.3/monad-control-1.0.2.3.tar.gz) = 6c1034189d237ae45368c70f0e68f714dd3beda715dd265b6c8a99fcc64022b1
 SIZE (cabal/monad-control-1.0.2.3/monad-control-1.0.2.3.tar.gz) = 13864
-SHA256 (cabal/network-3.1.1.1/network-3.1.1.1.tar.gz) = d7ef590173fff2ab522fbc167f3fafb867e4ecfca279eb3ef0d137b51f142c9a
-SIZE (cabal/network-3.1.1.1/network-3.1.1.1.tar.gz) = 118478
+SHA256 (cabal/network-3.1.2.0/network-3.1.2.0.tar.gz) = e02abd759a09d689eb0b802ff3c4c734e5ba23fe6b96873b613603479452eb1f
+SIZE (cabal/network-3.1.2.0/network-3.1.2.0.tar.gz) = 137615
+SHA256 (cabal/network-3.1.2.0/revision/1.cabal) = 3ace4c1cab0d8f7a0029188e0887a0526f0e148dccb4473eec65806c81df3a1d
+SIZE (cabal/network-3.1.2.0/revision/1.cabal) = 4962
 SHA256 (cabal/network-info-0.2.0.10/network-info-0.2.0.10.tar.gz) = 5680f6975d34cf4f81fa7ca0c8efd682261d6a1119e06dece0f67c7bd97fd52a
 SIZE (cabal/network-info-0.2.0.10/network-info-0.2.0.10.tar.gz) = 6278
 SHA256 (cabal/network-info-0.2.0.10/revision/1.cabal) = cda87030e0e7adc56696006035fc322d5a6b8b0b41dd6d339ea630484de1711e
@@ -205,8 +209,8 @@ SHA256 (cabal/pem-0.2.4/pem-0.2.4.tar.gz) = 770c4c1b9cd24b3db7f511f8a48404a0d098
 SIZE (cabal/pem-0.2.4/pem-0.2.4.tar.gz) = 4717
 SHA256 (cabal/pretty-show-1.10/pretty-show-1.10.tar.gz) = 307f9086e0b063d439dc4f513e36a145e8a57f23de448aefae2a6c00f6da6fd2
 SIZE (cabal/pretty-show-1.10/pretty-show-1.10.tar.gz) = 42233
-SHA256 (cabal/primitive-0.7.0.1/primitive-0.7.0.1.tar.gz) = dd8bb7d829f492d6200fca4a839a7563b80571c5f76b4d0fa76700ebe897f7dd
-SIZE (cabal/primitive-0.7.0.1/primitive-0.7.0.1.tar.gz) = 66023
+SHA256 (cabal/primitive-0.7.1.0/primitive-0.7.1.0.tar.gz) = 6bebecfdf2a57787d9fd5231bfd612b65a92edd7b33a973b2a0f11312b89a3f0
+SIZE (cabal/primitive-0.7.1.0/primitive-0.7.1.0.tar.gz) = 52184
 SHA256 (cabal/profunctors-5.5.2/profunctors-5.5.2.tar.gz) = 5f1579aab8afae377c7c7c0d0ed95b0bc58003b6dad2d494045f7472a398af7c
 SIZE (cabal/profunctors-5.5.2/profunctors-5.5.2.tar.gz) = 30041
 SHA256 (cabal/random-1.1/random-1.1.tar.gz) = b718a41057e25a3a71df693ab0fe2263d492e759679b3c2fea6ea33b171d3a5a
@@ -235,12 +239,12 @@ SHA256 (cabal/socks-0.6.1/socks-0.6.1.tar.gz) = 734447558bb061ce768f53a0df1f2401
 SIZE (cabal/socks-0.6.1/socks-0.6.1.tar.gz) = 9759
 SHA256 (cabal/split-0.2.3.4/split-0.2.3.4.tar.gz) = 271fe5104c9f40034aa9a1aad6269bcecc9454bc5a57c247e69e17de996c1f2a
 SIZE (cabal/split-0.2.3.4/split-0.2.3.4.tar.gz) = 15942
-SHA256 (cabal/splitmix-0.0.5/splitmix-0.0.5.tar.gz) = 19f2987ba707c935656371776639588c3252cbb44b66cae16107b13e73b4cd52
-SIZE (cabal/splitmix-0.0.5/splitmix-0.0.5.tar.gz) = 19026
+SHA256 (cabal/splitmix-0.1.0.1/splitmix-0.1.0.1.tar.gz) = 4d4b694846eac6af373e750e4c95c9ca2a984bc7f0e6466f973759d0fb1f192a
+SIZE (cabal/splitmix-0.1.0.1/splitmix-0.1.0.1.tar.gz) = 19090
 SHA256 (cabal/stm-delay-0.1.1.1/stm-delay-0.1.1.1.tar.gz) = b132581aac47e6cba6a1691a485e1700fbb047c02b7e1e43ae9bbd8476108a32
 SIZE (cabal/stm-delay-0.1.1.1/stm-delay-0.1.1.1.tar.gz) = 5550
-SHA256 (cabal/streaming-commons-0.2.1.2/streaming-commons-0.2.1.2.tar.gz) = ea2a6d4b2dfabe8cdf3b4e0a29db9b14170f59d3554b70e0377779867efcfc16
-SIZE (cabal/streaming-commons-0.2.1.2/streaming-commons-0.2.1.2.tar.gz) = 86776
+SHA256 (cabal/streaming-commons-0.2.2.1/streaming-commons-0.2.2.1.tar.gz) = 306940bf4878a0b714e6746a7f934d018100efc86332c176a648014bfe1e81dd
+SIZE (cabal/streaming-commons-0.2.2.1/streaming-commons-0.2.2.1.tar.gz) = 86559
 SHA256 (cabal/strict-0.3.2/strict-0.3.2.tar.gz) = 2cd35a67938db635a87617d9576d5df0158b581e8e5694f07487c0f4b1549221
 SIZE (cabal/strict-0.3.2/strict-0.3.2.tar.gz) = 3948
 SHA256 (cabal/syb-0.7.1/syb-0.7.1.tar.gz) = e04a9c7ae48d9fe25e9b7a064f7122d39c710753544511e15df7a6e87fdfe700
@@ -273,8 +277,8 @@ SHA256 (cabal/uniplate-1.6.12/uniplate-1.6.12.tar.gz) = fcc60bc6b3f6e925f611646d
 SIZE (cabal/uniplate-1.6.12/uniplate-1.6.12.tar.gz) = 30055
 SHA256 (cabal/uniplate-1.6.12/revision/1.cabal) = a428a3dbc905928168aaa66580cd2d4d47433c89fdfb66461f4fa232abd0593f
 SIZE (cabal/uniplate-1.6.12/revision/1.cabal) = 3498
-SHA256 (cabal/unordered-containers-0.2.11.0/unordered-containers-0.2.11.0.tar.gz) = 2b3a8c8d796f9c13aefd3a572c4b4ac0627726c037e832b8b43fd8804ec4a87c
-SIZE (cabal/unordered-containers-0.2.11.0/unordered-containers-0.2.11.0.tar.gz) = 49254
+SHA256 (cabal/unordered-containers-0.2.12.0/unordered-containers-0.2.12.0.tar.gz) = 481dab4ea59f10feaa7d65ecb8ae5d136d130bdbacf2356d414b3926d638bd20
+SIZE (cabal/unordered-containers-0.2.12.0/unordered-containers-0.2.12.0.tar.gz) = 53070
 SHA256 (cabal/utf8-string-1.0.1.1/utf8-string-1.0.1.1.tar.gz) = fb0b9e3acbe0605bcd1c63e51f290a7bbbe6628dfa3294ff453e4235fbaef140
 SIZE (cabal/utf8-string-1.0.1.1/utf8-string-1.0.1.1.tar.gz) = 8667
 SHA256 (cabal/utf8-string-1.0.1.1/revision/3.cabal) = 68cc6cf665e7212334a51b63d6936daeaca023b2cfe8637d130acfe95f91700b
@@ -285,12 +289,12 @@ SHA256 (cabal/uuid-1.3.13/revision/3.cabal) = 380b45cfd1d2dfda0b52d414f0040cef3a
 SIZE (cabal/uuid-1.3.13/revision/3.cabal) = 3137
 SHA256 (cabal/uuid-types-1.0.3/uuid-types-1.0.3.tar.gz) = 9276517ab24a9b06f39d6e3c33c6c2b4ace1fc2126dbc1cd9806866a6551b3fd
 SIZE (cabal/uuid-types-1.0.3/uuid-types-1.0.3.tar.gz) = 11999
-SHA256 (cabal/uuid-types-1.0.3/revision/2.cabal) = 2cab161f274309cfd9ef62694a6bd1b47525bc4c79a827293b055e4a9eadb4d2
-SIZE (cabal/uuid-types-1.0.3/revision/2.cabal) = 2473
+SHA256 (cabal/uuid-types-1.0.3/revision/3.cabal) = 4e27aa142cb37f391e78f36d13139ba0a907675429a21e8f2cfae9223202dd7e
+SIZE (cabal/uuid-types-1.0.3/revision/3.cabal) = 2496
 SHA256 (cabal/vector-0.12.1.2/vector-0.12.1.2.tar.gz) = 3b6e27683f6f20b37b8a35d0fab9e34b57dad72ac64cb16f428726780d4011bd
 SIZE (cabal/vector-0.12.1.2/vector-0.12.1.2.tar.gz) = 131049
-SHA256 (cabal/vty-5.28.2/vty-5.28.2.tar.gz) = 3bdf60e9445d0add86cd2c5d398107a2b9cc9e6e24b513c9b7b75d0e9182d149
-SIZE (cabal/vty-5.28.2/vty-5.28.2.tar.gz) = 104319
+SHA256 (cabal/vty-5.30/vty-5.30.tar.gz) = 722add849aa620ca0f7fb8e5268a83c3b88ebea15aaf8612b0308d7b91ff4ab0
+SIZE (cabal/vty-5.30/vty-5.30.tar.gz) = 105433
 SHA256 (cabal/websockets-0.12.7.1/websockets-0.12.7.1.tar.gz) = d356076b1ee6afcaf6dc075c2fd4194ca58a5088f43ce2cd10803b17f8db14cb
 SIZE (cabal/websockets-0.12.7.1/websockets-0.12.7.1.tar.gz) = 40141
 SHA256 (cabal/word-wrap-0.4.1/word-wrap-0.4.1.tar.gz) = eb72f91947c0c62cb862feb33cad9efdc5e720f456fa9ca68ef8ac9d1ec42c97
@@ -313,9 +317,7 @@ SHA256 (cabal/xdg-basedir-0.2.2/xdg-basedir-0.2.2.tar.gz) = e461c3a5c6007c55ceae
 SIZE (cabal/xdg-basedir-0.2.2/xdg-basedir-0.2.2.tar.gz) = 2606
 SHA256 (cabal/xss-sanitize-0.3.6/xss-sanitize-0.3.6.tar.gz) = b385eea5652c798b701c627dce8b327c3d6cbfd8c92e1e18e7118862d4d0e2b4
 SIZE (cabal/xss-sanitize-0.3.6/xss-sanitize-0.3.6.tar.gz) = 11655
-SHA256 (cabal/zlib-0.6.2.1/zlib-0.6.2.1.tar.gz) = f0f810ff173560b60392db448455c0513b3239f48e43cb494b3733aa559621d0
-SIZE (cabal/zlib-0.6.2.1/zlib-0.6.2.1.tar.gz) = 143424
-SHA256 (cabal/zlib-0.6.2.1/revision/1.cabal) = d34ddf5fece4d1e9d471b5298f36335bb3cfe12cb5a1b8525c42f0b665382f45
-SIZE (cabal/zlib-0.6.2.1/revision/1.cabal) = 4547
-SHA256 (cabal/matterhorn-chat-matterhorn-50200.9.0_GH0.tar.gz) = 0d19a2d5bb7633f8c3714acaf295ccd07d7fbf936ceeb80357d337b0fa70ddd7
-SIZE (cabal/matterhorn-chat-matterhorn-50200.9.0_GH0.tar.gz) = 1284146
+SHA256 (cabal/zlib-0.6.2.2/zlib-0.6.2.2.tar.gz) = 04b5890dd69e992f8cd09570d81e9d5ecab19db8e82cbe47ba8e02c31c0631ba
+SIZE (cabal/zlib-0.6.2.2/zlib-0.6.2.2.tar.gz) = 148178
+SHA256 (cabal/matterhorn-chat-matterhorn-50200.10.1_GH0.tar.gz) = 8fb1cc0e9f6f194f9c7748bff9bc112ef0cda3b10741afcb398c030855cba340
+SIZE (cabal/matterhorn-chat-matterhorn-50200.10.1_GH0.tar.gz) = 1295821
diff --git a/net-im/matterhorn/files/patch-matterhorn.cabal b/net-im/matterhorn/files/patch-matterhorn.cabal
deleted file mode 100644
index 7b93722dadf3..000000000000
--- a/net-im/matterhorn/files/patch-matterhorn.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- matterhorn.cabal.orig	2020-06-20 15:32:56 UTC
-+++ matterhorn.cabal
-@@ -150,7 +150,7 @@ executable matterhorn
-                      , config-ini           >= 0.2.2.0 && < 0.3
-                      , process              >= 1.4     && < 1.7
-                      , microlens-platform   >= 0.3     && < 0.5
--                     , brick                >= 0.52.1  && < 0.53
-+                     , brick                >= 0.52.1  && <= 0.53
-                      , brick-skylighting    >= 0.2     && < 0.4
-                      , vty                  >= 5.28    && < 5.29
-                      , word-wrap            >= 0.4.0   && < 0.5