git.iko.soy/roboservant
on master help sign in
Merge pull request #15 from mwotton/servant-0.16.2
00fbac5Mark Wotton
src/Roboservant/Types/ReifiedApi.hs+5−3
compare with master
unifiedsplit
@@ -179,15 +179,17 @@ instance
179 tagType (Argument (buildFrom @(IfRequiredLenient T.Text mods headerType)))
179 tagType (Argument (buildFrom @(IfRequiredLenient T.Text mods headerType)))
180 V.:& reifiedEndpointArguments @endpoint
180 V.:& reifiedEndpointArguments @endpoint
181
181
182+
183+-- this isn't happy in 0.16.2
182instance
184instance
183− ( BuildFrom (IfLenient String mods captureType)
185+ ( BuildFrom captureType
184 , ToReifiedEndpoint endpoint) =>
186 , ToReifiedEndpoint endpoint) =>
185 ToReifiedEndpoint (Capture' mods name captureType :> endpoint)
187 ToReifiedEndpoint (Capture' mods name captureType :> endpoint)
186 where
188 where
187− type EndpointArgs (Capture' mods name captureType :> endpoint) = IfLenient String mods captureType ': EndpointArgs endpoint
189+ type EndpointArgs (Capture' mods name captureType :> endpoint) = captureType ': EndpointArgs endpoint
188 type EndpointRes (Capture' mods name captureType :> endpoint) = EndpointRes endpoint
190 type EndpointRes (Capture' mods name captureType :> endpoint) = EndpointRes endpoint
189 reifiedEndpointArguments =
191 reifiedEndpointArguments =
190− tagType (Argument (buildFrom @(IfLenient String mods captureType)))
192+ tagType (Argument (buildFrom @(captureType)))
191 V.:& reifiedEndpointArguments @endpoint
193 V.:& reifiedEndpointArguments @endpoint
192
194
193-- caching for merge
195-- caching for merge
stack.yaml+5−4
@@ -9,10 +9,11 @@ extra-deps:
9- dependent-sum-0.7.1.0
9- dependent-sum-0.7.1.0
10- constraints-extras-0.3.0.2
10- constraints-extras-0.3.0.2
11- dependent-map-0.4.0.0
11- dependent-map-0.4.0.0
12+
12−- servant-0.18.2
13+- servant-0.16.2
13−- servant-client-0.18.2
14+- servant-client-0.16.0.1
14−- servant-client-core-0.18.2
15+- servant-client-core-0.16
15−- servant-server-0.18.2
16+- servant-server-0.16.2
16
17
17# cached for testing
18# cached for testing
18# - servant-0.18.2
19# - servant-0.18.2
stack.yaml.lock+16−16
@@ -40,33 +40,33 @@ packages:
40 original:
40 original:
41 hackage: dependent-map-0.4.0.0
41 hackage: dependent-map-0.4.0.0
42- completed:
42- completed:
43− hackage: servant-0.18.2@sha256:f8c9f0e9891a3ada1337a3c0b369333a3b5a2d0909dd3cd09d79bc26adeaca44,5298
43+ hackage: servant-0.16.2@sha256:6c5d19d09a9dd2f2b2bf99193f944491f8374802678b79ec729e3f3ae51e216d,5867
44 pantry-tree:
44 pantry-tree:
45− size: 2662
45+ size: 2604
46− sha256: e930e814de1aa4d24274bdf18341a50b7ed38604ae4734f730e09238ac5bf7e2
46+ sha256: bee4504840cf4836326e85f1cf02584bf898188b64d976dac6c6c6793d926794
47 original:
47 original:
48− hackage: servant-0.18.2
48+ hackage: servant-0.16.2
49- completed:
49- completed:
50− hackage: servant-client-0.18.2@sha256:82578ade7468873259bb2fdc9d62290a0f998550900683e1410a237ed4b05410,4591
50+ hackage: servant-client-0.16.0.1@sha256:f970ad4e927530b77f52b99a175c85cfdcd1ef988083d56a1f68c6a3dafe8d51,4376
51 pantry-tree:
51 pantry-tree:
52− size: 1300
52+ size: 804
53− sha256: 6324892c77bedbce32f0d6f1612fc2cb0d82c163d3be39efb951d3cc3792ce4a
53+ sha256: 3690a9c4dbdf8a502648c8c29029b1a0c78e53fd84db90ed388f7abbf5518c25
54 original:
54 original:
55− hackage: servant-client-0.18.2
55+ hackage: servant-client-0.16.0.1
56- completed:
56- completed:
57− hackage: servant-client-core-0.18.2@sha256:4cac20d0b0d889a5613a95ec18526afd16abcaf0b4b7ba5fed35c7bf85800162,3638
57+ hackage: servant-client-core-0.16@sha256:34e28b8d59b0b61fb3c97fb61043583538016898604a67bfa3bb35f02d8e4d9c,3545
58 pantry-tree:
58 pantry-tree:
59− size: 1444
59+ size: 1365
60− sha256: 90279e27ba5a7f8f4f1761e81d0dded343839316fdbf34d395954487701e29df
60+ sha256: d1a8c41b18e9648af8f1221c7747246ecde2a2ce2bae697c3c986f02a0caf857
61 original:
61 original:
62− hackage: servant-client-core-0.18.2
62+ hackage: servant-client-core-0.16
63- completed:
63- completed:
64− hackage: servant-server-0.18.2@sha256:56679af62ab8820a2108da6153d9ae9dde37199e62172365bdaea1458c3f7c2d,5482
64+ hackage: servant-server-0.16.2@sha256:f6b36df7c4f1688ff9d48d272e6cfc5f001b3221d2a732e73faf44e8b9e1ea04,5798
65 pantry-tree:
65 pantry-tree:
66− size: 2614
66+ size: 2517
67− sha256: 3ac7430134439e4b67f0f5333f63b89d0cb7de5e2e07f0af7801c8e223942b9c
67+ sha256: 12330638c1b455050d19ad0797b35893efbb5cd233789581eae93cc8983a84c3
68 original:
68 original:
69− hackage: servant-server-0.18.2
69+ hackage: servant-server-0.16.2
70snapshots:
70snapshots:
71- completed:
71- completed:
72 size: 532380
72 size: 532380