Skip to content

Commit 1d45b1e

Browse files
anmonteiroanmonteiro
authored
Upgrade to released Reason 3.5 that supports OCaml 4.08.0 (#38)
1 parent f374350 commit 1d45b1e

File tree

6 files changed

+93
-59
lines changed

6 files changed

+93
-59
lines changed

‎esy.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"@opam/conf-libev": "esy-packages/libev:package.json#0b5eb66",
2828
"@opam/httpaf": "anmonteiro/httpaf:httpaf.opam#7c5d991",
2929
"@opam/httpaf-lwt": "anmonteiro/httpaf:httpaf-lwt.opam#7c5d991",
30-
"@opam/httpaf-lwt-unix": "anmonteiro/httpaf:httpaf-lwt-unix.opam#7c5d991",
31-
"@opam/reason": "facebook/reason:reason.opam#f584e86"
30+
"@opam/httpaf-lwt-unix": "anmonteiro/httpaf:httpaf-lwt-unix.opam#7c5d991"
3231
}
3332
}

‎esy.lock/index.json

+51-46
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "91cf2b7c8e267c09ec20ab458bb0aa58",
2+
"checksum": "6e9e1e55153d6c4b8ec6cbba6a58c1a8",
33
"root": "aws-lambda-ocaml-runtime@link-dev:./esy.json",
44
"node": {
55
"[email protected]@d41d8cd9": {
@@ -34,9 +34,9 @@
3434
"@opam/alcotest@opam:0.8.5@68e6c66c"
3535
],
3636
"devDependencies": [
37-
"@opam/reason@github:facebook/reason:reason.opam#f584e86@d41d8cd9",
37+
"@opam/reason@opam:3.5.0@40205ac4",
3838
"@opam/ocamlformat@opam:0.10@2d49674c",
39-
"@opam/merlin@opam:3.3.1@4bcdbbb7"
39+
"@opam/merlin@opam:3.3.2@7a364181"
4040
]
4141
},
4242
"@opam/yojson@opam:1.7.0@7056d985": {
@@ -86,7 +86,7 @@
8686
"overrides": [],
8787
"dependencies": [
8888
"[email protected]@d41d8cd9", "@opam/uchar@opam:0.0.2@c8218eea",
89-
"@opam/topkg@opam:1.0.0@61f4ccf9",
89+
"@opam/topkg@opam:1.0.1@a42c631e",
9090
"@opam/ocamlfind@opam:1.8.0@f744a0c5",
9191
"@opam/ocamlbuild@opam:0.14.0@427a2331",
9292
"@opam/cmdliner@opam:1.0.4@93208aac",
@@ -116,7 +116,7 @@
116116
"dependencies": [
117117
"[email protected]@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
118118
"@opam/uucp@opam:12.0.0@b7d4c3df", "@opam/uchar@opam:0.0.2@c8218eea",
119-
"@opam/topkg@opam:1.0.0@61f4ccf9",
119+
"@opam/topkg@opam:1.0.1@a42c631e",
120120
"@opam/ocamlfind@opam:1.8.0@f744a0c5",
121121
"@opam/ocamlbuild@opam:0.14.0@427a2331",
122122
"@opam/cmdliner@opam:1.0.4@93208aac",
@@ -145,7 +145,7 @@
145145
},
146146
"overrides": [],
147147
"dependencies": [
148-
"[email protected]@d41d8cd9", "@opam/topkg@opam:1.0.0@61f4ccf9",
148+
"[email protected]@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e",
149149
"@opam/ocamlfind@opam:1.8.0@f744a0c5",
150150
"@opam/ocamlbuild@opam:0.14.0@427a2331",
151151
"@opam/cmdliner@opam:1.0.4@93208aac",
@@ -172,7 +172,7 @@
172172
"overrides": [],
173173
"dependencies": [
174174
"[email protected]@d41d8cd9", "@opam/uutf@opam:1.0.2@4440868f",
175-
"@opam/uchar@opam:0.0.2@c8218eea", "@opam/topkg@opam:1.0.0@61f4ccf9",
175+
"@opam/uchar@opam:0.0.2@c8218eea", "@opam/topkg@opam:1.0.1@a42c631e",
176176
"@opam/ocamlfind@opam:1.8.0@f744a0c5",
177177
"@opam/ocamlbuild@opam:0.14.0@427a2331",
178178
"@opam/cmdliner@opam:1.0.4@93208aac",
@@ -232,32 +232,30 @@
232232
],
233233
"devDependencies": [ "[email protected]@d41d8cd9" ]
234234
},
235-
"@opam/topkg@opam:1.0.0@61f4ccf9": {
236-
"id": "@opam/topkg@opam:1.0.0@61f4ccf9",
235+
"@opam/topkg@opam:1.0.1@a42c631e": {
236+
"id": "@opam/topkg@opam:1.0.1@a42c631e",
237237
"name": "@opam/topkg",
238-
"version": "opam:1.0.0",
238+
"version": "opam:1.0.1",
239239
"source": {
240240
"type": "install",
241241
"source": [
242-
"archive:https://opam.ocaml.org/cache/md5/e3/e3d76bda06bf68cb5853caf6627da603#md5:e3d76bda06bf68cb5853caf6627da603",
243-
"archive:http://erratique.ch/software/topkg/releases/topkg-1.0.0.tbz#md5:e3d76bda06bf68cb5853caf6627da603"
242+
"archive:https://opam.ocaml.org/cache/md5/16/16b90e066d8972a5ef59655e7c28b3e9#md5:16b90e066d8972a5ef59655e7c28b3e9",
243+
"archive:http://erratique.ch/software/topkg/releases/topkg-1.0.1.tbz#md5:16b90e066d8972a5ef59655e7c28b3e9"
244244
],
245245
"opam": {
246246
"name": "topkg",
247-
"version": "1.0.0",
248-
"path": "esy.lock/opam/topkg.1.0.0"
247+
"version": "1.0.1",
248+
"path": "esy.lock/opam/topkg.1.0.1"
249249
}
250250
},
251251
"overrides": [],
252252
"dependencies": [
253-
"[email protected]@d41d8cd9", "@opam/result@opam:1.4@6fb665c3",
254-
"@opam/ocamlfind@opam:1.8.0@f744a0c5",
253+
"[email protected]@d41d8cd9", "@opam/ocamlfind@opam:1.8.0@f744a0c5",
255254
"@opam/ocamlbuild@opam:0.14.0@427a2331",
256255
"@esy-ocaml/[email protected]@d41d8cd9"
257256
],
258257
"devDependencies": [
259-
"[email protected]@d41d8cd9", "@opam/result@opam:1.4@6fb665c3",
260-
"@opam/ocamlbuild@opam:0.14.0@427a2331"
258+
"[email protected]@d41d8cd9", "@opam/ocamlbuild@opam:0.14.0@427a2331"
261259
]
262260
},
263261
"@opam/stringext@opam:1.6.0@104bc94b": {
@@ -408,19 +406,25 @@
408406
"[email protected]@d41d8cd9", "@opam/dune@opam:1.10.0@b15ce221"
409407
]
410408
},
411-
"@opam/reason@github:facebook/reason:reason.opam#f584e86@d41d8cd9": {
412-
"id":
413-
"@opam/reason@github:facebook/reason:reason.opam#f584e86@d41d8cd9",
409+
"@opam/reason@opam:3.5.0@40205ac4": {
410+
"id": "@opam/reason@opam:3.5.0@40205ac4",
414411
"name": "@opam/reason",
415-
"version": "github:facebook/reason:reason.opam#f584e86",
412+
"version": "opam:3.5.0",
416413
"source": {
417414
"type": "install",
418-
"source": [ "github:facebook/reason:reason.opam#f584e86" ]
415+
"source": [
416+
"archive:https://opam.ocaml.org/cache/md5/db/db3431720b9c26ea10b938c1fa08289c#md5:db3431720b9c26ea10b938c1fa08289c",
417+
"archive:https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.5.0.tgz#md5:db3431720b9c26ea10b938c1fa08289c"
418+
],
419+
"opam": {
420+
"name": "reason",
421+
"version": "3.5.0",
422+
"path": "esy.lock/opam/reason.3.5.0"
423+
}
419424
},
420425
"overrides": [],
421426
"dependencies": [
422427
"[email protected]@d41d8cd9", "@opam/result@opam:1.4@6fb665c3",
423-
"@opam/ocamlfind@opam:1.8.0@f744a0c5",
424428
"@opam/ocaml-migrate-parsetree@opam:1.4.0@7f2e4334",
425429
"@opam/merlin-extend@opam:0.4@64c45329",
426430
"@opam/menhir@opam:20190626@bbeb8953",
@@ -430,7 +434,8 @@
430434
"[email protected]@d41d8cd9", "@opam/result@opam:1.4@6fb665c3",
431435
"@opam/ocaml-migrate-parsetree@opam:1.4.0@7f2e4334",
432436
"@opam/merlin-extend@opam:0.4@64c45329",
433-
"@opam/menhir@opam:20190626@bbeb8953"
437+
"@opam/menhir@opam:20190626@bbeb8953",
438+
"@opam/dune@opam:1.10.0@b15ce221"
434439
]
435440
},
436441
"@opam/re@opam:1.9.0@fc2ceb05": {
@@ -487,20 +492,20 @@
487492
"@opam/dune@opam:1.10.0@b15ce221"
488493
]
489494
},
490-
"@opam/ppx_tools@opam:5.2+4.08.0@964f70cb": {
491-
"id": "@opam/ppx_tools@opam:5.2+4.08.0@964f70cb",
495+
"@opam/ppx_tools@opam:5.3+4.08.0@0ce29228": {
496+
"id": "@opam/ppx_tools@opam:5.3+4.08.0@0ce29228",
492497
"name": "@opam/ppx_tools",
493-
"version": "opam:5.2+4.08.0",
498+
"version": "opam:5.3+4.08.0",
494499
"source": {
495500
"type": "install",
496501
"source": [
497-
"archive:https://opam.ocaml.org/cache/md5/3f/3f911ebddad5eb4dd279b303a34d9493#md5:3f911ebddad5eb4dd279b303a34d9493",
498-
"archive:https://github.com/ocaml-ppx/ppx_tools/archive/5.2+4.08.0.tar.gz#md5:3f911ebddad5eb4dd279b303a34d9493"
502+
"archive:https://opam.ocaml.org/cache/md5/70/702b11138c095662c175aa4dcce5c921#md5:702b11138c095662c175aa4dcce5c921",
503+
"archive:https://github.com/ocaml-ppx/ppx_tools/archive/5.3+4.08.0.tar.gz#md5:702b11138c095662c175aa4dcce5c921"
499504
],
500505
"opam": {
501506
"name": "ppx_tools",
502-
"version": "5.2+4.08.0",
503-
"path": "esy.lock/opam/ppx_tools.5.2+4.08.0"
507+
"version": "5.3+4.08.0",
508+
"path": "esy.lock/opam/ppx_tools.5.3+4.08.0"
504509
}
505510
},
506511
"overrides": [],
@@ -530,7 +535,7 @@
530535
"dependencies": [
531536
"[email protected]@d41d8cd9", "@opam/yojson@opam:1.7.0@7056d985",
532537
"@opam/result@opam:1.4@6fb665c3", "@opam/ppxfind@opam:1.3@9b29babb",
533-
"@opam/ppx_tools@opam:5.2+4.08.0@964f70cb",
538+
"@opam/ppx_tools@opam:5.3+4.08.0@0ce29228",
534539
"@opam/ppx_deriving@opam:4.4@43678d5a",
535540
"@opam/dune@opam:1.10.0@b15ce221", "@opam/cppo@opam:1.6.6@f4f83858",
536541
"@esy-ocaml/[email protected]@d41d8cd9"
@@ -562,15 +567,15 @@
562567
"dependencies": [
563568
"[email protected]@d41d8cd9", "@opam/result@opam:1.4@6fb665c3",
564569
"@opam/ppxfind@opam:1.3@9b29babb",
565-
"@opam/ppx_tools@opam:5.2+4.08.0@964f70cb",
570+
"@opam/ppx_tools@opam:5.3+4.08.0@0ce29228",
566571
"@opam/ppx_derivers@opam:1.2.1@aee9c3db",
567572
"@opam/ocaml-migrate-parsetree@opam:1.4.0@7f2e4334",
568573
"@opam/dune@opam:1.10.0@b15ce221", "@opam/cppo@opam:1.6.6@f4f83858",
569574
"@esy-ocaml/[email protected]@d41d8cd9"
570575
],
571576
"devDependencies": [
572577
"[email protected]@d41d8cd9", "@opam/result@opam:1.4@6fb665c3",
573-
"@opam/ppx_tools@opam:5.2+4.08.0@964f70cb",
578+
"@opam/ppx_tools@opam:5.3+4.08.0@0ce29228",
574579
"@opam/ppx_derivers@opam:1.2.1@aee9c3db",
575580
"@opam/ocaml-migrate-parsetree@opam:1.4.0@7f2e4334",
576581
"@opam/dune@opam:1.10.0@b15ce221"
@@ -799,20 +804,20 @@
799804
"[email protected]@d41d8cd9", "@opam/dune@opam:1.10.0@b15ce221"
800805
]
801806
},
802-
"@opam/merlin@opam:3.3.1@4bcdbbb7": {
803-
"id": "@opam/merlin@opam:3.3.1@4bcdbbb7",
807+
"@opam/merlin@opam:3.3.2@7a364181": {
808+
"id": "@opam/merlin@opam:3.3.2@7a364181",
804809
"name": "@opam/merlin",
805-
"version": "opam:3.3.1",
810+
"version": "opam:3.3.2",
806811
"source": {
807812
"type": "install",
808813
"source": [
809-
"archive:https://opam.ocaml.org/cache/md5/b5/b542cacabeb98f9f22c6740f22a9fea7#md5:b542cacabeb98f9f22c6740f22a9fea7",
810-
"archive:https://github.com/ocaml/merlin/archive/v3.3.1.tar.gz#md5:b542cacabeb98f9f22c6740f22a9fea7"
814+
"archive:https://opam.ocaml.org/cache/sha256/1d/1d1c71e663b1e58acf19069cebd1e8d18f7dbe513c6065347d162cdd2c2de801#sha256:1d1c71e663b1e58acf19069cebd1e8d18f7dbe513c6065347d162cdd2c2de801",
815+
"archive:https://github.com/ocaml/merlin/releases/download/v3.3.2/merlin-v3.3.2.tbz#sha256:1d1c71e663b1e58acf19069cebd1e8d18f7dbe513c6065347d162cdd2c2de801"
811816
],
812817
"opam": {
813818
"name": "merlin",
814-
"version": "3.3.1",
815-
"path": "esy.lock/opam/merlin.3.3.1"
819+
"version": "3.3.2",
820+
"path": "esy.lock/opam/merlin.3.3.2"
816821
}
817822
},
818823
"overrides": [],
@@ -901,7 +906,7 @@
901906
},
902907
"overrides": [],
903908
"dependencies": [
904-
"[email protected]@d41d8cd9", "@opam/topkg@opam:1.0.0@61f4ccf9",
909+
"[email protected]@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e",
905910
"@opam/ocamlfind@opam:1.8.0@f744a0c5",
906911
"@opam/ocamlbuild@opam:0.14.0@427a2331",
907912
"@opam/lwt@opam:4.2.1@08ba7e51", "@opam/fmt@opam:0.8.6@a06c130d",
@@ -1020,7 +1025,7 @@
10201025
},
10211026
"overrides": [],
10221027
"dependencies": [
1023-
"[email protected]@d41d8cd9", "@opam/topkg@opam:1.0.0@61f4ccf9",
1028+
"[email protected]@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e",
10241029
"@opam/result@opam:1.4@6fb665c3",
10251030
"@opam/ocamlfind@opam:1.8.0@f744a0c5",
10261031
"@opam/ocamlbuild@opam:0.14.0@427a2331",
@@ -1050,7 +1055,7 @@
10501055
},
10511056
"overrides": [],
10521057
"dependencies": [
1053-
"[email protected]@d41d8cd9", "@opam/topkg@opam:1.0.0@61f4ccf9",
1058+
"[email protected]@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e",
10541059
"@opam/stdlib-shims@opam:0.1.0@d957c903",
10551060
"@opam/seq@opam:base@d8d7de1d",
10561061
"@opam/ocamlfind@opam:1.8.0@f744a0c5",
@@ -1502,7 +1507,7 @@
15021507
},
15031508
"overrides": [],
15041509
"dependencies": [
1505-
"[email protected]@d41d8cd9", "@opam/topkg@opam:1.0.0@61f4ccf9",
1510+
"[email protected]@d41d8cd9", "@opam/topkg@opam:1.0.1@a42c631e",
15061511
"@opam/ocamlfind@opam:1.8.0@f744a0c5",
15071512
"@opam/ocamlbuild@opam:0.14.0@427a2331",
15081513
"@opam/base-bytes@opam:base@19d0c2ff",

‎esy.lock/opam/merlin.3.3.1/opam ‎esy.lock/opam/merlin.3.3.2/opam

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
opam-version: "2.0"
2+
name: "merlin"
23
maintainer: "[email protected]"
34
authors: "The Merlin team"
45
homepage: "https://github.com/ocaml/merlin"
@@ -7,7 +8,6 @@ dev-repo: "git+https://github.com/ocaml/merlin.git"
78
build: [
89
["dune" "subst"] {pinned}
910
["dune" "build" "-p" name "-j" jobs]
10-
["dune" "runtest" "-p" name "-j" jobs] {with-test}
1111
]
1212
depends: [
1313
"ocaml" {>= "4.02.1" & < "4.09"}
@@ -61,9 +61,10 @@ See https://github.com/OCamlPro/opam-user-setup
6161
{success & !user-setup:installed}
6262
]
6363
url {
64-
src: "https://github.com/ocaml/merlin/archive/v3.3.1.tar.gz"
64+
src:
65+
"https://github.com/ocaml/merlin/releases/download/v3.3.2/merlin-v3.3.2.tbz"
6566
checksum: [
66-
"md5=b542cacabeb98f9f22c6740f22a9fea7"
67-
"sha512=8aa976197a55cdbe38180e80b1ae98b7408734a7a55b975a5be982016e7e723c64e9a82bcb1ff2827b27f9c5d210a2c34665d3e5c18afdaf4b0767b526b3d834"
67+
"sha256=1d1c71e663b1e58acf19069cebd1e8d18f7dbe513c6065347d162cdd2c2de801"
68+
"sha512=3ae021669808a40b4449f1cbdaca40b605ea5779a6204addd8b0ee4af9f14f528d55ca43a8dd3c7d547fb8e4cb256c09a9151d5559ef24dad83b5ab05aa146a2"
6869
]
6970
}

‎esy.lock/opam/ppx_tools.5.2+4.08.0/opam ‎esy.lock/opam/ppx_tools.5.3+4.08.0/opam

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ depends: [
1414
"ocamlfind" {build & >= "1.5.0"}
1515
]
1616
url {
17-
src: "https://github.com/ocaml-ppx/ppx_tools/archive/5.2+4.08.0.tar.gz"
18-
checksum: "md5=3f911ebddad5eb4dd279b303a34d9493"
17+
src: "https://github.com/ocaml-ppx/ppx_tools/archive/5.3+4.08.0.tar.gz"
18+
checksum: "md5=702b11138c095662c175aa4dcce5c921"
1919
}

‎esy.lock/opam/reason.3.5.0/opam

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
opam-version: "2.0"
2+
maintainer: "Jordan Walke <[email protected]>"
3+
authors: [ "Jordan Walke <[email protected]>" ]
4+
license: "MIT"
5+
homepage: "https://github.com/facebook/reason"
6+
doc: "http://reasonml.github.io/"
7+
bug-reports: "https://github.com/facebook/reason/issues"
8+
dev-repo: "git://github.com/facebook/reason.git"
9+
tags: [ "syntax" ]
10+
build: [
11+
["dune" "build" "-p" name "-j" jobs]
12+
["dune" "runtest" "-p" name "-j" jobs] {with-test}
13+
]
14+
depends: [
15+
"ocaml" {>= "4.02" & < "4.09"}
16+
"dune" {>= "1.4"}
17+
"menhir" {>= "20170418"}
18+
"merlin-extend" {>= "0.4"}
19+
"result"
20+
"ocaml-migrate-parsetree"
21+
]
22+
synopsis: "Reason: Syntax & Toolchain for OCaml"
23+
description: """
24+
Reason gives OCaml a new syntax that is remniscient of languages like
25+
JavaScript. It's also the umbrella project for a set of tools for the OCaml &
26+
JavaScript ecosystem."""
27+
url {
28+
src: "https://registry.npmjs.org/@esy-ocaml/reason/-/reason-3.5.0.tgz"
29+
checksum: "md5=db3431720b9c26ea10b938c1fa08289c"
30+
}

‎esy.lock/opam/topkg.1.0.0/opam ‎esy.lock/opam/topkg.1.0.1/opam

+4-5
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ dev-repo: "git+http://erratique.ch/repos/topkg.git"
88
bug-reports: "https://github.com/dbuenzli/topkg/issues"
99
tags: ["packaging" "ocamlbuild" "org:erratique"]
1010
depends: [
11-
"ocaml" {>= "4.01.0"}
11+
"ocaml" {>= "4.03.0"}
1212
"ocamlfind" {build & >= "1.6.1"}
13-
"ocamlbuild"
14-
"result" ]
13+
"ocamlbuild" ]
1514
build: [[
1615
"ocaml" "pkg/pkg.ml" "build"
1716
"--pkg-name" name
@@ -44,6 +43,6 @@ Topkg-care is distributed under the ISC license it depends on
4443
[webbrowser]: http://erratique.ch/software/webbrowser
4544
"""
4645
url {
47-
src: "http://erratique.ch/software/topkg/releases/topkg-1.0.0.tbz"
48-
checksum: "md5=e3d76bda06bf68cb5853caf6627da603"
46+
archive: "http://erratique.ch/software/topkg/releases/topkg-1.0.1.tbz"
47+
checksum: "16b90e066d8972a5ef59655e7c28b3e9"
4948
}

0 commit comments

Comments
 (0)