Skip to content

Commit 6271587

Browse files
committed
bump stackage (16.14 -> 18.18)
1 parent 31b1ea1 commit 6271587

File tree

3 files changed

+51
-884
lines changed

3 files changed

+51
-884
lines changed

libs/types-common/src/Data/Text/Ascii.hs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,7 @@ encodeBase16 = unsafeFromByteString . B16.encode
339339
-- | Decode a text containing only hex characters.
340340
-- Decoding only succeeds if the text is a multiple of 2 bytes in length.
341341
decodeBase16 :: AsciiBase16 -> Maybe ByteString
342-
decodeBase16 t = case B16.decode (toByteString' t) of
343-
(b, r) | r == mempty -> Just b
344-
(_, _) -> Nothing
342+
decodeBase16 t = either (const Nothing) Just (B16.decode (toByteString' t))
345343

346344
--------------------------------------------------------------------------------
347345
-- Safe Widening

stack.yaml

Lines changed: 50 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,19 @@
1-
resolver: lts-16.14
1+
resolver: lts-18.18
2+
3+
# to bump blocks of custom dependencies to the latest version on hackage:
4+
#
5+
# /tmp/1.sh:
6+
# #!/bin/bash
7+
# cabal list "$1" | perl -ne '/^..'$1'$/ && { $x=1 }; /^$/ && { $x=0 }; if ($x) { /version: (.+)$/ && print "$1" }'
8+
#
9+
# /tmp/2.sh:
10+
# #!/bin/bash
11+
# perl -ne '/^- (\S+)-([01123456789\.]+)(\@\S+)?(.*)$/ && do { print "- $1-"; system("/tmp/1.sh $1"); print "$4\n" }'
12+
#
13+
# ... and then pipe the blocks of extra-deps through /tmp/2.sh.
14+
# sorry for the hideous code, couldn't get it into one line (some
15+
# limitation to perl that i don't want to have to understand).
16+
# anyway it works!
217

318
packages:
419
- libs/api-bot
@@ -137,27 +152,27 @@ extra-deps:
137152

138153
# Dropped from upstream snapshot
139154
- template-0.2.0.10
140-
- HaskellNet-0.5.2
141-
- smtp-mail-0.2.0.0
142-
- stm-containers-1.1.0.4 # Latest: lts-15.16
155+
- HaskellNet-0.6
156+
- smtp-mail-0.3.0.0
157+
- stm-containers-1.2
143158
- redis-resp-1.0.0
144-
- stm-hamt-1.2.0.4 # Latest: lts-15.16
145-
- primitive-unlifted-0.1.2.0 # Latest: lts-15.16
159+
- stm-hamt-1.2.0.6
160+
- primitive-unlifted-1.0.0.0
146161
- prometheus-2.2.2 # Only in nightly so far
147162

148163
# Not on stackage
149164
- currency-codes-3.0.0.1
150165
- mime-0.4.0.2
151166
- data-timeout-0.3.1
152-
- geoip2-0.4.0.1
153-
- stomp-queue-0.3.1
167+
- geoip2-0.4.1.0
168+
- stomp-queue-0.5.1
154169
- text-icu-translit-0.1.0.7
155170
- wai-middleware-gunzip-0.0.2
156171
- cql-io-tinylog-0.1.0
157172
- invertible-hxt-0.1
158173
- base58-bytestring-0.1.0
159-
- stompl-0.5.0
160-
- pattern-trie-0.1.0
174+
- stompl-0.6.0
175+
- pattern-trie-0.1.1
161176
- markov-chain-usage-model-0.0.0
162177
- wai-predicates-1.0.0
163178
- redis-io-1.1.0
@@ -167,12 +182,12 @@ extra-deps:
167182
- wai-route-0.4.0
168183

169184
# Not updated on Stackage yet
170-
- QuickCheck-2.14
171-
- splitmix-0.0.4 # needed for QuickCheck
185+
- QuickCheck-2.14.2
186+
- splitmix-0.1.0.4 # needed for QuickCheck
172187
- servant-mock-0.8.7
173-
- servant-swagger-ui-0.3.4.3.36.1
188+
- servant-swagger-ui-0.3.5.3.52.5
174189
- tls-1.5.5
175-
- cryptonite-0.28
190+
- cryptonite-0.29
176191

177192
# For changes from #128 and #135, not released to hackage yet
178193
- git: https://github.com/haskell-servant/servant-swagger
@@ -188,18 +203,18 @@ extra-deps:
188203
- servant-client
189204
- servant-client-core
190205

191-
- HsOpenSSL-x509-system-0.1.0.3@sha256:f4958ee0eec555c5c213662eff6764bddefe5665e2afcfd32733ce3801a9b687,1774 # Latest: lts-14.27
192-
- cql-4.0.2@sha256:a0006a5ac13d6f86d5eff28c11be80928246309f217ea6d5f5c8a76a5d16b48b,3157 # Latest: lts-14.27
193-
- cql-io-1.1.1@sha256:897ef0811b227c8b1a269b29b9c1ebfb09c46f00d66834e2e8c6f19ea7f90f7d,4611 # Latest: lts-14.27
194-
- primitive-extras-0.8@sha256:fca0310150496867f5b9421fe1541ecda87fae17eae44885a29f9c52dd00c8ff,2963 # Latest: lts-15.16
195-
- text-format-0.3.2@sha256:2a3fc17cf87120fcfdbca62a0da59759755549285841cdc1483081c35fb3d115,1814 # Latest: lts-14.27
196-
- hex-0.2.0@sha256:197d2561d2e216c4ead035b4911dabc6e678ac6257cb71b64e324c822f6f9f5a,726 # Latest: lts-14.27
206+
- HsOpenSSL-x509-system-0.1.0.4
207+
- cql-4.0.3
208+
- cql-io-1.1.1
209+
- primitive-extras-0.10.1.1
210+
- text-format-0.3.2
211+
- hex-0.2.0
197212

198213

199214
# Not in the upstream snapshot and not using latest version on hackage due to
200215
# breaking change
201-
- quickcheck-state-machine-0.6.0
202-
- servant-multipart-0.11.5@sha256:1633f715b5b53d648a1da69839bdc5046599f4f7244944d4bbf852dba38d8f4b,2319
216+
- quickcheck-state-machine-0.7.1
217+
- servant-multipart-0.12.1
203218

204219
# Dependencies on upstream source
205220

@@ -208,20 +223,20 @@ extra-deps:
208223
commit: ca84ef29a93eaef7673fa58056cdd8dae1568d2d # master (Sep 14, 2020)
209224

210225
# mu
211-
- mu-rpc-0.4.0.1
226+
- mu-rpc-0.5.0.1
212227
- mu-optics-0.3.0.1
213228
- mu-avro-0.4.0.4
214229
- mu-protobuf-0.4.2.0
215230
- mu-schema-0.3.1.2
216-
- mu-grpc-server-0.4.0.0
231+
- mu-grpc-server-0.5.0.0
217232
- mu-grpc-client-0.4.0.1
218233
- mu-grpc-common-0.4.0.0
219234
- compendium-client-0.2.1.1
220235
# dependencies of mu
221236
- http2-grpc-types-0.5.0.0
222237
- http2-grpc-proto3-wire-0.1.0.0
223238
- warp-grpc-0.4.0.1
224-
- proto3-wire-1.2.0
239+
- proto3-wire-1.2.2
225240
- parameterized-0.5.0.0
226241

227242
# Unreleased master.
@@ -236,12 +251,6 @@ extra-deps:
236251
subdirs:
237252
- http2-client-grpc
238253

239-
# Fix for issue #27: https://github.com/kazu-yamamoto/http2/issues/27
240-
# PR here: https://github.com/kazu-yamamoto/http2/pull/28
241-
# Note: the commit used here is based on version 2.0.6 of http2
242-
- git: https://github.com/wireapp/http2 # (2021-06-09) branch: header-encoding-0-size-table-backport
243-
commit: 7c465be1201e0945b106f7cc6176ac1b1193be13
244-
245254
# Fix in PR: https://github.com/bos/snappy/pull/7
246255
- git: https://github.com/wireapp/snappy
247256
commit: b0e5c08af48911caecffa4fa6a3e74872018b258 # master (Sep 03, 2021)
@@ -253,16 +262,23 @@ extra-deps:
253262
- x509-store
254263

255264
# Not on stackage yet
256-
- polysemy-1.7.0.0
265+
- polysemy-1.7.1.0
257266
- polysemy-plugin-0.4.2.0
258267
- polysemy-check-0.8.1.0
259268

269+
# ad-hoc additions (on 2021-10-10)
270+
- proto-lens-0.7.1.0
271+
- proto-lens-protoc-0.7.1.0
272+
- proto-lens-runtime-0.7.0.1
273+
- proto-lens-setup-0.4.0.5
274+
- tracing-0.0.7.2
275+
260276
############################################################
261277
# Development tools
262278
############################################################
263279

264280
- ormolu-0.1.4.1
265281
- ghc-lib-parser-8.10.1.20200412@sha256:b0517bb150a02957d7180f131f5b94abd2a7f58a7d1532a012e71618282339c2,8751 # for ormolu
266282

267-
- headroom-0.2.1.0
268-
- implicit-hie-0.1.2.5
283+
- headroom-0.4.2.0
284+
- implicit-hie-0.1.2.6

0 commit comments

Comments
 (0)