Skip to content

Commit f59a8a8

Browse files
authored
Merge pull request #32 from cknitt/feature/reason-3.4.0
Reason 3.4.0
2 parents 9517189 + 2473aa7 commit f59a8a8

File tree

13 files changed

+146
-143
lines changed

13 files changed

+146
-143
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ os:
55
- linux
66
- osx
77
install:
8-
- npm install --global esy@0.4.7
8+
- npm install --global esy@0.4.9
99
- esy install
1010
script:
1111
- esy build

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ RUN apt-get update \
44
&& DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs npm git rsync m4 curl \
55
&& rm -rf /var/lib/apt/lists/*
66

7-
RUN npm i -g esy@0.4.7
7+
RUN npm i -g esy@0.4.9

esy.lock/index.json

Lines changed: 87 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "980b4f0f39e7cdb2ffe7ad31f156a57f",
2+
"checksum": "52094406998daf0708d776164b283a3f",
33
"root": "bs-react-intl-extractor@link:./package.json",
44
"node": {
55
"refmterr@3.1.10@d41d8cd9": {
@@ -15,7 +15,7 @@
1515
"overrides": [],
1616
"dependencies": [
1717
"ocaml@4.6.9@d41d8cd9", "@opam/re@opam:1.7.3@83095efd",
18-
"@opam/dune@opam:1.6.2@7b47a809", "@esy-ocaml/reason@3.3.7@d41d8cd9"
18+
"@opam/dune@opam:1.6.3@a7d7baed", "@esy-ocaml/reason@3.4.0@d41d8cd9"
1919
],
2020
"devDependencies": []
2121
},
@@ -41,35 +41,35 @@
4141
"overrides": [],
4242
"dependencies": [
4343
"refmterr@3.1.10@d41d8cd9", "ocaml@4.6.9@d41d8cd9",
44-
"@opam/yojson@opam:1.4.1@975f5bbf",
45-
"@opam/ppx_fast_pipe@opam:0.0.1@917690c6",
46-
"@opam/dune@opam:1.6.2@7b47a809",
44+
"@opam/yojson@opam:1.5.0@890db858",
45+
"@opam/ppx_fast_pipe@opam:0.0.1@2e77442d",
46+
"@opam/dune@opam:1.6.3@a7d7baed",
4747
"@opam/alcotest@opam:0.8.4@ddaee259",
48-
"@esy-ocaml/reason@3.3.7@d41d8cd9"
48+
"@esy-ocaml/reason@3.4.0@d41d8cd9"
4949
],
5050
"devDependencies": [ "@esy-ocaml/merlin@3.0.5005@d41d8cd9" ]
5151
},
52-
"@opam/yojson@opam:1.4.1@975f5bbf": {
53-
"id": "@opam/yojson@opam:1.4.1@975f5bbf",
52+
"@opam/yojson@opam:1.5.0@890db858": {
53+
"id": "@opam/yojson@opam:1.5.0@890db858",
5454
"name": "@opam/yojson",
55-
"version": "opam:1.4.1",
55+
"version": "opam:1.5.0",
5656
"source": {
5757
"type": "install",
5858
"source": [
59-
"archive:https://opam.ocaml.org/cache/md5/3e/3ea6e36422dd670e8ab880710d5f7398#md5:3ea6e36422dd670e8ab880710d5f7398",
60-
"archive:https://github.com/mjambon/yojson/archive/v1.4.1.tar.gz#md5:3ea6e36422dd670e8ab880710d5f7398"
59+
"archive:https://opam.ocaml.org/cache/md5/d8/d80de1bacdde292af42f7c78b323da7b#md5:d80de1bacdde292af42f7c78b323da7b",
60+
"archive:https://github.com/ocaml-community/yojson/releases/download/1.5.0/yojson-1.5.0.tbz#md5:d80de1bacdde292af42f7c78b323da7b"
6161
],
6262
"opam": {
6363
"name": "yojson",
64-
"version": "1.4.1",
65-
"path": "esy.lock/opam/yojson.1.4.1"
64+
"version": "1.5.0",
65+
"path": "esy.lock/opam/yojson.1.5.0"
6666
}
6767
},
6868
"overrides": [],
6969
"dependencies": [
70-
"ocaml@4.6.9@d41d8cd9", "@opam/jbuilder@opam:transition@58bdfe0a",
71-
"@opam/easy-format@opam:1.3.1@9abfd4ed",
72-
"@opam/cppo@opam:1.6.5@bec3dbd9", "@opam/biniou@opam:1.2.0@c8516f18",
70+
"ocaml@4.6.9@d41d8cd9", "@opam/easy-format@opam:1.3.1@9abfd4ed",
71+
"@opam/dune@opam:1.6.3@a7d7baed", "@opam/cppo@opam:1.6.5@bec3dbd9",
72+
"@opam/biniou@opam:1.2.0@c8516f18",
7373
"@esy-ocaml/substs@0.0.1@d41d8cd9"
7474
],
7575
"devDependencies": [
@@ -180,34 +180,34 @@
180180
],
181181
"devDependencies": [ "ocaml@4.6.9@d41d8cd9" ]
182182
},
183-
"@opam/reason@opam:3.3.7@0ced1ee6": {
184-
"id": "@opam/reason@opam:3.3.7@0ced1ee6",
183+
"@opam/reason@opam:3.4.0@9dac40ad": {
184+
"id": "@opam/reason@opam:3.4.0@9dac40ad",
185185
"name": "@opam/reason",
186-
"version": "opam:3.3.7",
186+
"version": "opam:3.4.0",
187187
"source": {
188188
"type": "install",
189189
"source": [
190-
"archive:https://opam.ocaml.org/cache/md5/01/01625d9f44a059f429db1bc1f94d811e#md5:01625d9f44a059f429db1bc1f94d811e",
191-
"archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.3.7.tgz#md5:01625d9f44a059f429db1bc1f94d811e"
190+
"archive:https://opam.ocaml.org/cache/md5/1b/1b6cba03588e5fba3b5eb693c0d02dea#md5:1b6cba03588e5fba3b5eb693c0d02dea",
191+
"archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.4.0.tgz#md5:1b6cba03588e5fba3b5eb693c0d02dea"
192192
],
193193
"opam": {
194194
"name": "reason",
195-
"version": "3.3.7",
196-
"path": "esy.lock/opam/reason.3.3.7"
195+
"version": "3.4.0",
196+
"path": "esy.lock/opam/reason.3.4.0"
197197
}
198198
},
199199
"overrides": [],
200200
"dependencies": [
201201
"ocaml@4.6.9@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e",
202202
"@opam/ocamlfind@opam:1.8.0@96572762",
203-
"@opam/ocaml-migrate-parsetree@opam:1.1.0@fc3908dc",
203+
"@opam/ocaml-migrate-parsetree@opam:1.2.0@5b3aa0d3",
204204
"@opam/merlin-extend@opam:0.3@e1fc0d08",
205205
"@opam/menhir@opam:20181113@0c8257a8",
206-
"@opam/dune@opam:1.6.2@7b47a809", "@esy-ocaml/substs@0.0.1@d41d8cd9"
206+
"@opam/dune@opam:1.6.3@a7d7baed", "@esy-ocaml/substs@0.0.1@d41d8cd9"
207207
],
208208
"devDependencies": [
209209
"ocaml@4.6.9@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e",
210-
"@opam/ocaml-migrate-parsetree@opam:1.1.0@fc3908dc",
210+
"@opam/ocaml-migrate-parsetree@opam:1.2.0@5b3aa0d3",
211211
"@opam/merlin-extend@opam:0.3@e1fc0d08",
212212
"@opam/menhir@opam:20181113@0c8257a8"
213213
]
@@ -235,15 +235,15 @@
235235
],
236236
"devDependencies": [ "ocaml@4.6.9@d41d8cd9" ]
237237
},
238-
"@opam/ppx_fast_pipe@opam:0.0.1@917690c6": {
239-
"id": "@opam/ppx_fast_pipe@opam:0.0.1@917690c6",
238+
"@opam/ppx_fast_pipe@opam:0.0.1@2e77442d": {
239+
"id": "@opam/ppx_fast_pipe@opam:0.0.1@2e77442d",
240240
"name": "@opam/ppx_fast_pipe",
241241
"version": "opam:0.0.1",
242242
"source": {
243243
"type": "install",
244244
"source": [
245-
"archive:https://opam.ocaml.org/cache/md5/2b/2b0b56a5d3c437dc93d3353ea7f74e3c#md5:2b0b56a5d3c437dc93d3353ea7f74e3c",
246-
"archive:https://github.com/IwanKaramazow/FastPipe/archive/0.0.1.tar.gz#md5:2b0b56a5d3c437dc93d3353ea7f74e3c"
245+
"archive:https://opam.ocaml.org/cache/md5/3e/3e4cf5f2de1b2c077d7708fc566a317a#md5:3e4cf5f2de1b2c077d7708fc566a317a",
246+
"archive:https://github.com/IwanKaramazow/PipeFirst/archive/0.0.1.tar.gz#md5:3e4cf5f2de1b2c077d7708fc566a317a"
247247
],
248248
"opam": {
249249
"name": "ppx_fast_pipe",
@@ -253,15 +253,38 @@
253253
},
254254
"overrides": [],
255255
"dependencies": [
256-
"ocaml@4.6.9@d41d8cd9", "@opam/reason@opam:3.3.7@0ced1ee6",
257-
"@opam/ocaml-migrate-parsetree@opam:1.1.0@fc3908dc",
258-
"@opam/dune@opam:1.6.2@7b47a809", "@esy-ocaml/substs@0.0.1@d41d8cd9"
256+
"ocaml@4.6.9@d41d8cd9", "@opam/reason@opam:3.4.0@9dac40ad",
257+
"@opam/ocaml-migrate-parsetree@opam:1.2.0@5b3aa0d3",
258+
"@opam/dune@opam:1.6.3@a7d7baed", "@esy-ocaml/substs@0.0.1@d41d8cd9"
259259
],
260260
"devDependencies": [
261-
"ocaml@4.6.9@d41d8cd9", "@opam/reason@opam:3.3.7@0ced1ee6",
262-
"@opam/ocaml-migrate-parsetree@opam:1.1.0@fc3908dc"
261+
"ocaml@4.6.9@d41d8cd9", "@opam/reason@opam:3.4.0@9dac40ad",
262+
"@opam/ocaml-migrate-parsetree@opam:1.2.0@5b3aa0d3"
263263
]
264264
},
265+
"@opam/ppx_derivers@opam:1.0@78655ff8": {
266+
"id": "@opam/ppx_derivers@opam:1.0@78655ff8",
267+
"name": "@opam/ppx_derivers",
268+
"version": "opam:1.0",
269+
"source": {
270+
"type": "install",
271+
"source": [
272+
"archive:https://opam.ocaml.org/cache/md5/4d/4ddce8f43fdb9b0ef0ab6a7cbfebc3e3#md5:4ddce8f43fdb9b0ef0ab6a7cbfebc3e3",
273+
"archive:https://github.com/ocaml-ppx/ppx_derivers/archive/1.0.tar.gz#md5:4ddce8f43fdb9b0ef0ab6a7cbfebc3e3"
274+
],
275+
"opam": {
276+
"name": "ppx_derivers",
277+
"version": "1.0",
278+
"path": "esy.lock/opam/ppx_derivers.1.0"
279+
}
280+
},
281+
"overrides": [],
282+
"dependencies": [
283+
"ocaml@4.6.9@d41d8cd9", "@opam/jbuilder@opam:transition@58bdfe0a",
284+
"@esy-ocaml/substs@0.0.1@d41d8cd9"
285+
],
286+
"devDependencies": [ "ocaml@4.6.9@d41d8cd9" ]
287+
},
265288
"@opam/ocamlfind@opam:1.8.0@96572762": {
266289
"id": "@opam/ocamlfind@opam:1.8.0@96572762",
267290
"name": "@opam/ocamlfind",
@@ -318,34 +341,31 @@
318341
],
319342
"devDependencies": [ "ocaml@4.6.9@d41d8cd9" ]
320343
},
321-
"@opam/ocaml-migrate-parsetree@opam:1.1.0@fc3908dc": {
322-
"id": "@opam/ocaml-migrate-parsetree@opam:1.1.0@fc3908dc",
344+
"@opam/ocaml-migrate-parsetree@opam:1.2.0@5b3aa0d3": {
345+
"id": "@opam/ocaml-migrate-parsetree@opam:1.2.0@5b3aa0d3",
323346
"name": "@opam/ocaml-migrate-parsetree",
324-
"version": "opam:1.1.0",
347+
"version": "opam:1.2.0",
325348
"source": {
326349
"type": "install",
327350
"source": [
328-
"archive:https://opam.ocaml.org/cache/md5/7d/7dd4808e27af98065f63604c9658d311#md5:7dd4808e27af98065f63604c9658d311",
329-
"archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.1.0/ocaml-migrate-parsetree-1.1.0.tbz#md5:7dd4808e27af98065f63604c9658d311"
351+
"archive:https://opam.ocaml.org/cache/md5/cc/cc6fb09ad6f99156c7dba47711c62c6f#md5:cc6fb09ad6f99156c7dba47711c62c6f",
352+
"archive:https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.2.0/ocaml-migrate-parsetree-v1.2.0.tbz#md5:cc6fb09ad6f99156c7dba47711c62c6f"
330353
],
331354
"opam": {
332355
"name": "ocaml-migrate-parsetree",
333-
"version": "1.1.0",
334-
"path": "esy.lock/opam/ocaml-migrate-parsetree.1.1.0"
356+
"version": "1.2.0",
357+
"path": "esy.lock/opam/ocaml-migrate-parsetree.1.2.0"
335358
}
336359
},
337-
"overrides": [
338-
{
339-
"opamoverride":
340-
"esy.lock/overrides/opam__s__ocaml_migrate_parsetree_opam__c__1.1.0_opam_override"
341-
}
342-
],
360+
"overrides": [],
343361
"dependencies": [
344362
"ocaml@4.6.9@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e",
345-
"@opam/dune@opam:1.6.2@7b47a809", "@esy-ocaml/substs@0.0.1@d41d8cd9"
363+
"@opam/ppx_derivers@opam:1.0@78655ff8",
364+
"@opam/dune@opam:1.6.3@a7d7baed", "@esy-ocaml/substs@0.0.1@d41d8cd9"
346365
],
347366
"devDependencies": [
348-
"ocaml@4.6.9@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e"
367+
"ocaml@4.6.9@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e",
368+
"@opam/ppx_derivers@opam:1.0@78655ff8"
349369
]
350370
},
351371
"@opam/merlin-extend@opam:0.3@e1fc0d08": {
@@ -415,11 +435,11 @@
415435
},
416436
"overrides": [],
417437
"dependencies": [
418-
"ocaml@4.6.9@d41d8cd9", "@opam/dune@opam:1.6.2@7b47a809",
438+
"ocaml@4.6.9@d41d8cd9", "@opam/dune@opam:1.6.3@a7d7baed",
419439
"@esy-ocaml/substs@0.0.1@d41d8cd9"
420440
],
421441
"devDependencies": [
422-
"ocaml@4.6.9@d41d8cd9", "@opam/dune@opam:1.6.2@7b47a809"
442+
"ocaml@4.6.9@d41d8cd9", "@opam/dune@opam:1.6.3@a7d7baed"
423443
]
424444
},
425445
"@opam/fmt@opam:0.8.5@01e38a4e": {
@@ -476,26 +496,26 @@
476496
],
477497
"devDependencies": [ "ocaml@4.6.9@d41d8cd9" ]
478498
},
479-
"@opam/dune@opam:1.6.2@7b47a809": {
480-
"id": "@opam/dune@opam:1.6.2@7b47a809",
499+
"@opam/dune@opam:1.6.3@a7d7baed": {
500+
"id": "@opam/dune@opam:1.6.3@a7d7baed",
481501
"name": "@opam/dune",
482-
"version": "opam:1.6.2",
502+
"version": "opam:1.6.3",
483503
"source": {
484504
"type": "install",
485505
"source": [
486-
"archive:https://opam.ocaml.org/cache/md5/e6/e628e3903d2418d410e058ca49938a5d#md5:e628e3903d2418d410e058ca49938a5d",
487-
"archive:https://github.com/ocaml/dune/releases/download/1.6.2/dune-1.6.2.tbz#md5:e628e3903d2418d410e058ca49938a5d"
506+
"archive:https://opam.ocaml.org/cache/md5/12/1212a36547d25269675d767c38fecf5f#md5:1212a36547d25269675d767c38fecf5f",
507+
"archive:https://github.com/ocaml/dune/releases/download/1.6.3/dune-1.6.3.tbz#md5:1212a36547d25269675d767c38fecf5f"
488508
],
489509
"opam": {
490510
"name": "dune",
491-
"version": "1.6.2",
492-
"path": "esy.lock/opam/dune.1.6.2"
511+
"version": "1.6.3",
512+
"path": "esy.lock/opam/dune.1.6.3"
493513
}
494514
},
495515
"overrides": [
496516
{
497517
"opamoverride":
498-
"esy.lock/overrides/opam__s__dune_opam__c__1.6.2_opam_override"
518+
"esy.lock/overrides/opam__s__dune_opam__c__1.6.3_opam_override"
499519
}
500520
],
501521
"dependencies": [
@@ -748,24 +768,24 @@
748768
"dependencies": [],
749769
"devDependencies": []
750770
},
751-
"@esy-ocaml/reason@3.3.7@d41d8cd9": {
752-
"id": "@esy-ocaml/reason@3.3.7@d41d8cd9",
771+
"@esy-ocaml/reason@3.4.0@d41d8cd9": {
772+
"id": "@esy-ocaml/reason@3.4.0@d41d8cd9",
753773
"name": "@esy-ocaml/reason",
754-
"version": "3.3.7",
774+
"version": "3.4.0",
755775
"source": {
756776
"type": "install",
757777
"source": [
758-
"archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.3.7.tgz#sha1:4d75b8876807c4178c6fff2359962066bb69d944"
778+
"archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.4.0.tgz#sha1:8c84c183a95d489a3e82ff0465effe4b56ff12af"
759779
]
760780
},
761781
"overrides": [],
762782
"dependencies": [
763783
"ocaml@4.6.9@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e",
764784
"@opam/ocamlfind@opam:1.8.0@96572762",
765-
"@opam/ocaml-migrate-parsetree@opam:1.1.0@fc3908dc",
785+
"@opam/ocaml-migrate-parsetree@opam:1.2.0@5b3aa0d3",
766786
"@opam/merlin-extend@opam:0.3@e1fc0d08",
767787
"@opam/menhir@opam:20181113@0c8257a8",
768-
"@opam/dune@opam:1.6.2@7b47a809"
788+
"@opam/dune@opam:1.6.3@a7d7baed"
769789
],
770790
"devDependencies": []
771791
},
@@ -781,7 +801,7 @@
781801
},
782802
"overrides": [],
783803
"dependencies": [
784-
"ocaml@4.6.9@d41d8cd9", "@opam/yojson@opam:1.4.1@975f5bbf",
804+
"ocaml@4.6.9@d41d8cd9", "@opam/yojson@opam:1.5.0@890db858",
785805
"@opam/ocamlfind@opam:1.8.0@96572762",
786806
"@esy-ocaml/substs@0.0.1@d41d8cd9",
787807
"@esy-ocaml/esy-installer@0.0.0@d41d8cd9"

esy.lock/opam/dune.1.6.2/opam renamed to esy.lock/opam/dune.1.6.3/opam

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ packages across several versions of OCaml and gives cross-compilation
4242
for free.
4343
"""
4444
url {
45-
src: "https://github.com/ocaml/dune/releases/download/1.6.2/dune-1.6.2.tbz"
46-
checksum: "md5=e628e3903d2418d410e058ca49938a5d"
45+
src: "https://github.com/ocaml/dune/releases/download/1.6.3/dune-1.6.3.tbz"
46+
checksum: "md5=1212a36547d25269675d767c38fecf5f"
4747
}

esy.lock/opam/ocaml-migrate-parsetree.1.1.0/opam renamed to esy.lock/opam/ocaml-migrate-parsetree.1.2.0/opam

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,24 @@ dev-repo: "git+https://github.com/ocaml-ppx/ocaml-migrate-parsetree.git"
1111
doc: "https://ocaml-ppx.github.io/ocaml-migrate-parsetree/"
1212
tags: [ "syntax" "org:ocamllabs" ]
1313
build: [
14-
["jbuilder" "build" "-p" name "-j" jobs]
14+
["dune" "build" "-p" name "-j" jobs]
1515
]
1616
depends: [
1717
"result"
18-
"dune" {build}
19-
"ocaml" {>= "4.02.0"}
18+
"ppx_derivers"
19+
"dune" {build & >= "1.6.0"}
20+
"ocaml" {>= "4.02.3"}
2021
]
21-
22+
synopsis: "Convert OCaml parsetrees between different versions"
2223
description: """
23-
Convert OCaml parsetrees between different versions
24+
Convert OCaml parsetrees between different versions
2425

25-
This library converts parsetrees, outcometree and ast mappers between different OCaml versions.
26-
High-level functions help making PPX rewriters independent of a compiler version.
26+
This library converts parsetrees, outcometree and ast mappers between
27+
different OCaml versions. High-level functions help making PPX
28+
rewriters independent of a compiler version.
2729
"""
28-
2930
url {
30-
src: "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.1.0/ocaml-migrate-parsetree-1.1.0.tbz"
31-
checksum: ["md5=7dd4808e27af98065f63604c9658d311"]
31+
src:
32+
"https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/v1.2.0/ocaml-migrate-parsetree-v1.2.0.tbz"
33+
checksum: "md5=cc6fb09ad6f99156c7dba47711c62c6f"
3234
}
33-
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
opam-version: "2.0"
2+
maintainer: "jeremie@dimino.org"
3+
authors: ["Jérémie Dimino"]
4+
license: "BSD3"
5+
homepage: "https://github.com/ocaml-ppx/ppx_derivers"
6+
bug-reports: "https://github.com/ocaml-ppx/ppx_derivers/issues"
7+
dev-repo: "git://github.com/ocaml-ppx/ppx_derivers.git"
8+
build: [
9+
["jbuilder" "build" "-p" name "-j" jobs]
10+
]
11+
depends: [
12+
"ocaml"
13+
"jbuilder" {build & >= "1.0+beta7"}
14+
]
15+
synopsis: "Shared [@@deriving] plugin registry"
16+
description: """
17+
Ppx_derivers is a tiny package whose sole purpose is to allow
18+
ppx_deriving and ppx_type_conv to inter-operate gracefully when linked
19+
as part of the same ocaml-migrate-parsetree driver."""
20+
url {
21+
src: "https://github.com/ocaml-ppx/ppx_derivers/archive/1.0.tar.gz"
22+
checksum: "md5=4ddce8f43fdb9b0ef0ab6a7cbfebc3e3"
23+
}

0 commit comments

Comments
 (0)