Skip to content

Commit a669c98

Browse files
MNassimMMNassimM
committed
deps(opam): Add Irmin-git 3.10.0
This change needed to refactor the decompress-based deflate encoding
1 parent 793ebc8 commit a669c98

File tree

5 files changed

+161
-82
lines changed

5 files changed

+161
-82
lines changed

‎learn-ocaml-client.opam.locked‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ bug-reports: "https://github.com/ocaml-sf/learn-ocaml/issues"
2323
depends: [
2424
"angstrom" {= "0.15.0"}
2525
"asak" {= "0.5"}
26-
"asn1-combinators" {= "0.2.6"}
26+
"asn1-combinators" {= "0.3.2"}
2727
"astring" {= "0.8.5"}
2828
"base" {= "v0.16.3"}
2929
"base-bigarray" {= "base"}
@@ -34,16 +34,16 @@ depends: [
3434
"base-unix" {= "base"}
3535
"base64" {= "3.5.0"}
3636
"bigarray-compat" {= "1.1.0"}
37-
"bigstringaf" {= "0.8.0"}
37+
"bigstringaf" {= "0.10.0"}
3838
"bos" {= "0.2.1"}
39-
"ca-certs" {= "0.2.3"}
40-
"cmdliner" {= "1.1.0"}
41-
"cohttp" {= "4.0.0"}
42-
"cohttp-lwt" {= "4.0.0"}
43-
"cohttp-lwt-unix" {= "4.0.0"}
44-
"conduit" {= "4.0.2"}
45-
"conduit-lwt" {= "4.0.2"}
46-
"conduit-lwt-unix" {= "4.0.2"}
39+
"ca-certs" {= "1.0.0"}
40+
"cmdliner" {= "1.3.0"}
41+
"cohttp" {= "5.3.1"}
42+
"cohttp-lwt" {= "5.3.0"}
43+
"cohttp-lwt-unix" {= "5.3.0"}
44+
"conduit" {= "7.0.0"}
45+
"conduit-lwt" {= "7.0.0"}
46+
"conduit-lwt-unix" {= "7.0.0"}
4747
"conf-bash" {= "1"}
4848
"conf-gmp" {= "4"}
4949
"conf-gmp-powm-sec" {= "3"}
@@ -55,7 +55,7 @@ depends: [
5555
"digestif" {= "1.2.0"}
5656
"domain-name" {= "0.4.0"}
5757
"dune" {= "3.16.0"}
58-
"dune-configurator" {= "2.9.3"}
58+
"dune-configurator" {= "3.17.2"}
5959
"duration" {= "0.2.1"}
6060
"eqaf" {= "0.9"}
6161
"ezjsonm" {= "1.3.0"}
@@ -75,6 +75,7 @@ depends: [
7575
"json-data-encoding" {= "1.0.1"}
7676
"jsonm" {= "1.0.1"}
7777
"jst-config" {= "v0.16.0"}
78+
"kdf" {= "1.0.0"}
7879
"logs" {= "0.7.0"}
7980
"lwt" {= "5.7.0"}
8081
"lwt_ssl" {= "1.1.3"}
@@ -84,11 +85,10 @@ depends: [
8485
"menhirCST" {= "20231231"}
8586
"menhirLib" {= "20231231"}
8687
"menhirSdk" {= "20231231"}
87-
"mirage-crypto" {= "0.11.3"}
88-
"mirage-crypto-ec" {= "0.11.3"}
89-
"mirage-crypto-pk" {= "0.11.3"}
90-
"mirage-crypto-rng" {= "0.11.3"}
91-
"num" {= "1.4"}
88+
"mirage-crypto" {= "1.1.0"}
89+
"mirage-crypto-ec" {= "1.1.0"}
90+
"mirage-crypto-pk" {= "1.1.0"}
91+
"mirage-crypto-rng" {= "1.1.0"}
9292
"ocaml" {= "5.1.1"}
9393
"ocaml-compiler-libs" {= "v0.12.4"}
9494
"ocaml-config" {= "3"}
@@ -99,9 +99,8 @@ depends: [
9999
"ocp-indent-nlfork" {= "1.5.5"}
100100
"ocp-ocamlres" {= "0.4"}
101101
"ocplib-endian" {= "1.2"}
102+
"ohex" {= "0.2.0"}
102103
"omd" {= "1.3.2"}
103-
"parsexp" {= "v0.16.0"}
104-
"pbkdf" {= "1.2.0"}
105104
"pprint" {= "20220103"}
106105
"ppx_assert" {= "v0.16.0"}
107106
"ppx_base" {= "v0.16.0"}
@@ -124,7 +123,6 @@ depends: [
124123
"rresult" {= "0.7.0"}
125124
"sedlex" {= "3.2"}
126125
"seq" {= "base"}
127-
"sexplib" {= "v0.16.0"}
128126
"sexplib0" {= "v0.16.0"}
129127
"ssl" {= "0.7.0"}
130128
"stdio" {= "v0.16.0"}
@@ -137,7 +135,7 @@ depends: [
137135
"uri-sexp" {= "4.2.0"}
138136
"uutf" {= "1.0.3"}
139137
"vg" {= "0.9.4"}
140-
"x509" {= "0.16.5"}
138+
"x509" {= "1.0.5"}
141139
"yojson" {= "2.2.2"}
142140
"zarith" {= "1.13"}
143141
]

‎learn-ocaml.opam‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ depends: [
2929
"cohttp-lwt-unix" {>= "2.0.0"}
3030
"conduit-lwt-unix" {< "7.1.0"}
3131
"conf-git"
32-
"decompress" {= "0.8.1"}
32+
"decompress" {>= "1.5.3"}
3333
"digestif" {>= "1.2.0"}
3434
"dune" {>= "2.3.0"}
3535
"easy-format" {>= "1.3.0" }
3636
"ezjsonm"
3737
"ipaddr" {>= "2.9.0" }
38+
"irmin-git" {= "3.10.0"}
3839
"js_of_ocaml" {>= "5.0.0"}
3940
"js_of_ocaml-compiler" {>= "5.0.0"}
4041
"js_of_ocaml-lwt"

‎learn-ocaml.opam.locked‎

Lines changed: 105 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
11
opam-version: "2.0"
22
name: "learn-ocaml"
33
version: "1.1.0"
4+
synopsis: "The learn-ocaml online platform (engine)"
5+
description: """\
6+
This contains the binaries forming the engine for the learn-ocaml platform, and
7+
the common files. A demo exercise repository is also provided as example."""
8+
maintainer: [
9+
"Érik Martin-Dorel <[email protected]>"
10+
"Yann Régis-Gianas <[email protected]>"
11+
"Louis Gesbert <[email protected]>"
12+
]
413
authors: [
514
"Benjamin Canou (OCamlPro)"
615
"Çağdaş Bozman (OCamlPro)"
716
"Grégoire Henry (OCamlPro)"
817
"Louis Gesbert (OCamlPro)"
918
"Pierrick Couderc (OCamlPro)"
1019
]
11-
maintainer: [
12-
"Érik Martin-Dorel <[email protected]>"
13-
"Yann Régis-Gianas <[email protected]>"
14-
"Louis Gesbert <[email protected]>"
15-
]
1620
license: "MIT"
1721
homepage: "https://github.com/ocaml-sf/learn-ocaml"
1822
bug-reports: "https://github.com/ocaml-sf/learn-ocaml/issues"
19-
dev-repo: "git+https://github.com/ocaml-sf/learn-ocaml"
2023
depends: [
2124
"angstrom" {= "0.15.0"}
25+
"arp" {= "3.1.1"}
2226
"asak" {= "0.5"}
23-
"asn1-combinators" {= "0.2.6"}
27+
"asn1-combinators" {= "0.3.2"}
2428
"astring" {= "0.8.5"}
29+
"awa" {= "0.4.0"}
30+
"awa-mirage" {= "0.4.0"}
2531
"base" {= "v0.16.3"}
2632
"base-bigarray" {= "base"}
2733
"base-bytes" {= "base"}
@@ -30,46 +36,87 @@ depends: [
3036
"base-threads" {= "base"}
3137
"base-unix" {= "base"}
3238
"base64" {= "3.5.0"}
39+
"bheap" {= "2.0.0"}
3340
"bigarray-compat" {= "1.1.0"}
34-
"bigstringaf" {= "0.8.0"}
41+
"bigstringaf" {= "0.10.0"}
3542
"bos" {= "0.2.1"}
36-
"ca-certs" {= "0.2.3"}
43+
"ca-certs" {= "1.0.0"}
44+
"ca-certs-nss" {= "3.107"}
3745
"camlp-streams" {= "5.0.1"}
38-
"checkseum" {= "0.3.2"}
39-
"cmdliner" {= "1.1.0"}
40-
"cohttp" {= "4.0.0"}
41-
"cohttp-lwt" {= "4.0.0"}
42-
"cohttp-lwt-unix" {= "4.0.0"}
43-
"conduit" {= "4.0.2"}
44-
"conduit-lwt" {= "4.0.2"}
45-
"conduit-lwt-unix" {= "4.0.2"}
46+
"carton" {= "0.7.2"}
47+
"carton-git" {= "0.7.2"}
48+
"carton-lwt" {= "0.7.2"}
49+
"cf" {= "0.5.0"}
50+
"cf-lwt" {= "0.5.0"}
51+
"checkseum" {= "0.5.2"}
52+
"cmdliner" {= "1.3.0"}
53+
"cohttp" {= "5.3.1"}
54+
"cohttp-lwt" {= "5.3.0"}
55+
"cohttp-lwt-unix" {= "5.3.0"}
56+
"conduit" {= "7.0.0"}
57+
"conduit-lwt" {= "7.0.0"}
58+
"conduit-lwt-unix" {= "7.0.0"}
4659
"conf-bash" {= "1"}
4760
"conf-git" {= "1.1"}
4861
"conf-gmp" {= "4"}
4962
"conf-gmp-powm-sec" {= "3"}
63+
"conf-libffi" {= "2.0.0"}
5064
"conf-libssl" {= "4"}
5165
"conf-pkg-config" {= "3"}
5266
"cppo" {= "1.6.8"}
5367
"crunch" {= "3.3.1"}
5468
"csexp" {= "1.5.1"}
5569
"cstruct" {= "6.2.0"}
56-
"decompress" {= "0.8.1"}
70+
"cstruct-lwt" {= "6.2.0"}
71+
"cstruct-unix" {= "6.2.0"}
72+
"ctypes" {= "0.23.0"}
73+
"ctypes-foreign" {= "0.23.0"}
74+
"decompress" {= "1.5.3"}
5775
"digestif" {= "1.2.0"}
76+
"dns" {= "9.1.0"}
77+
"dns-client" {= "9.1.0"}
78+
"dns-client-mirage" {= "9.1.0"}
5879
"domain-name" {= "0.4.0"}
80+
"duff" {= "0.5"}
5981
"dune" {= "3.16.0"}
60-
"dune-configurator" {= "2.9.3"}
82+
"dune-configurator" {= "3.17.2"}
6183
"duration" {= "0.2.1"}
6284
"easy-format" {= "1.3.4"}
85+
"either" {= "1.0.0"}
86+
"emile" {= "1.1"}
87+
"encore" {= "0.8"}
6388
"eqaf" {= "0.9"}
89+
"ethernet" {= "3.2.0"}
6490
"ezjsonm" {= "1.3.0"}
91+
"faraday" {= "0.8.2"}
6592
"fmt" {= "0.9.0"}
6693
"fpath" {= "0.7.3"}
94+
"fsevents" {= "0.3.0"}
95+
"fsevents-lwt" {= "0.3.0"}
6796
"gen" {= "1.1"}
6897
"gg" {= "1.0.0"}
98+
"git" {= "3.17.0"}
99+
"git-mirage" {= "3.17.0"}
100+
"git-paf" {= "3.17.0"}
101+
"git-unix" {= "3.17.0"}
69102
"gmap" {= "0.3.0"}
103+
"h2" {= "0.13.0"}
104+
"happy-eyeballs" {= "1.2.2"}
105+
"happy-eyeballs-lwt" {= "1.2.2"}
106+
"happy-eyeballs-mirage" {= "1.2.2"}
70107
"hex" {= "1.4.0"}
108+
"hpack" {= "0.13.0"}
109+
"httpaf" {= "0.7.1"}
110+
"httpun-types" {= "0.2.0"}
111+
"hxd" {= "0.3.3"}
112+
"inotify" {= "2.6"}
113+
"integers" {= "0.7.0"}
71114
"ipaddr" {= "5.6.0"}
115+
"ipaddr-cstruct" {= "5.6.0"}
72116
"ipaddr-sexp" {= "5.6.0"}
117+
"irmin" {= "3.10.0"}
118+
"irmin-git" {= "3.10.0"}
119+
"irmin-watcher" {= "0.5.0"}
73120
"jane-street-headers" {= "v0.16.0"}
74121
"js_of_ocaml" {= "5.8.2"}
75122
"js_of_ocaml-compiler" {= "5.8.2"}
@@ -81,23 +128,41 @@ depends: [
81128
"json-data-encoding-browser" {= "1.0.1"}
82129
"jsonm" {= "1.0.1"}
83130
"jst-config" {= "v0.16.0"}
131+
"kdf" {= "1.0.0"}
132+
"ke" {= "0.6"}
84133
"logs" {= "0.7.0"}
134+
"lru" {= "0.3.1"}
85135
"lwt" {= "5.7.0"}
136+
"lwt-dllist" {= "1.0.1"}
86137
"lwt_log" {= "1.1.2"}
87138
"lwt_react" {= "1.1.5"}
88139
"lwt_ssl" {= "1.1.3"}
89140
"macaddr" {= "5.6.0"}
141+
"macaddr-cstruct" {= "5.6.0"}
90142
"magic-mime" {= "1.2.0"}
91143
"markup" {= "1.0.3"}
92144
"markup-lwt" {= "0.5.0"}
93145
"menhir" {= "20231231"}
94146
"menhirCST" {= "20231231"}
95147
"menhirLib" {= "20231231"}
96148
"menhirSdk" {= "20231231"}
97-
"mirage-crypto" {= "0.11.3"}
98-
"mirage-crypto-ec" {= "0.11.3"}
99-
"mirage-crypto-pk" {= "0.11.3"}
100-
"mirage-crypto-rng" {= "0.11.3"}
149+
"metrics" {= "0.4.1"}
150+
"mimic" {= "0.0.9"}
151+
"mimic-happy-eyeballs" {= "0.0.9"}
152+
"mirage-clock" {= "4.2.0"}
153+
"mirage-clock-unix" {= "4.2.0"}
154+
"mirage-crypto" {= "1.1.0"}
155+
"mirage-crypto-ec" {= "1.1.0"}
156+
"mirage-crypto-pk" {= "1.1.0"}
157+
"mirage-crypto-rng" {= "1.1.0"}
158+
"mirage-crypto-rng-mirage" {= "1.1.0"}
159+
"mirage-flow" {= "4.0.2"}
160+
"mirage-kv" {= "6.1.1"}
161+
"mirage-net" {= "4.0.0"}
162+
"mirage-runtime" {= "4.8.2"}
163+
"mirage-time" {= "3.0.0"}
164+
"mirage-unix" {= "5.0.1"}
165+
"mtime" {= "2.1.0"}
101166
"num" {= "1.4"}
102167
"ocaml" {= "5.1.1"}
103168
"ocaml-compiler-libs" {= "v0.12.4"}
@@ -106,35 +171,44 @@ depends: [
106171
"ocaml-syntax-shims" {= "1.0.0"}
107172
"ocamlbuild" {= "0.14.3"}
108173
"ocamlfind" {= "1.9.6"}
174+
"ocamlgraph" {= "2.1.0"}
109175
"ocp-indent-nlfork" {= "1.5.5"}
110176
"ocp-ocamlres" {= "0.4"}
111177
"ocplib-endian" {= "1.2"}
112178
"odoc" {= "2.4.2"}
113179
"odoc-parser" {= "2.4.2"}
180+
"ohex" {= "0.2.0"}
114181
"omd" {= "1.3.2"}
115-
"optint" {= "0.1.0"}
182+
"optint" {= "0.3.0"}
183+
"paf" {= "0.7.0"}
116184
"parsexp" {= "v0.16.0"}
117-
"pbkdf" {= "1.2.0"}
185+
"pecu" {= "0.7"}
118186
"pprint" {= "20220103"}
119187
"ppx_assert" {= "v0.16.0"}
120188
"ppx_base" {= "v0.16.0"}
121189
"ppx_cold" {= "v0.16.0"}
122190
"ppx_compare" {= "v0.16.0"}
123191
"ppx_cstruct" {= "6.2.0"}
124192
"ppx_derivers" {= "1.2.1"}
193+
"ppx_deriving" {= "6.0.3"}
125194
"ppx_enumerate" {= "v0.16.0"}
126195
"ppx_expect" {= "v0.16.0"}
127196
"ppx_globalize" {= "v0.16.0"}
128197
"ppx_hash" {= "v0.16.0"}
129198
"ppx_here" {= "v0.16.0"}
130199
"ppx_inline_test" {= "v0.16.1"}
200+
"ppx_irmin" {= "3.10.0"}
131201
"ppx_optcomp" {= "v0.16.0"}
202+
"ppx_repr" {= "0.7.0"}
132203
"ppx_sexp_conv" {= "v0.16.0"}
133204
"ppxlib" {= "0.32.1"}
205+
"psq" {= "0.2.1"}
134206
"ptime" {= "1.1.0"}
207+
"randomconv" {= "0.2.0"}
135208
"re" {= "1.10.3"}
136209
"react" {= "1.2.2"}
137210
"reactiveData" {= "0.3.0"}
211+
"repr" {= "0.7.0"}
138212
"result" {= "1.5"}
139213
"rresult" {= "0.7.0"}
140214
"sedlex" {= "3.2"}
@@ -145,15 +219,18 @@ depends: [
145219
"stdio" {= "v0.16.0"}
146220
"stdlib-shims" {= "0.3.0"}
147221
"stringext" {= "1.6.0"}
222+
"tcpip" {= "8.2.0"}
148223
"time_now" {= "v0.16.0"}
224+
"tls" {= "1.0.4"}
225+
"tls-mirage" {= "1.0.4"}
149226
"topkg" {= "1.0.7"}
150227
"tyxml" {= "4.6.0"}
151228
"uchar" {= "0.0.2"}
152229
"uri" {= "4.2.0"}
153230
"uri-sexp" {= "4.2.0"}
154231
"uutf" {= "1.0.3"}
155232
"vg" {= "0.9.4"}
156-
"x509" {= "0.16.5"}
233+
"x509" {= "1.0.5"}
157234
"yojson" {= "2.2.2"}
158235
"zarith" {= "1.13"}
159236
]
@@ -162,14 +239,10 @@ build: [
162239
["dune" "build" "-p" name "-j" jobs]
163240
[make "detect-libs"] {with-test}
164241
]
242+
run-test: [make "test"]
165243
install: [
166244
["mkdir" "-p" "%{_:share}%"]
167245
["cp" "-r" "demo-repository" "%{_:share}%/repository"]
168246
]
169-
synopsis: "The learn-ocaml online platform (engine)"
170-
description: """
171-
This contains the binaries forming the engine for the learn-ocaml platform, and
172-
the common files. A demo exercise repository is also provided as example.
173-
"""
174-
run-test: [make "test"]
175247
depexts: ["lsof"] {os-distribution = "alpine"}
248+
dev-repo: "git+https://github.com/ocaml-sf/learn-ocaml"

‎src/server/dune‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
magic-mime
1212
sha
1313
checkseum.c
14-
decompress
14+
decompress.de
15+
decompress.zl
1516
learnocaml_report
1617
learnocaml_data
1718
learnocaml_api

0 commit comments

Comments
 (0)