Skip to content

Commit 46890fd

Browse files
maxRNmaxRN
committed
build: add packages to dune-project + re-generate opam files
1 parent b0b401b commit 46890fd

5 files changed

+346
-84
lines changed

‎dream-httpaf.opam

+25-28
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,44 @@
1+
# This file is generated by dune, edit dune-project instead
12
opam-version: "2.0"
2-
3-
synopsis: "Internal: shared http/af stack for Dream (server) and Hyper (client)"
3+
synopsis:
4+
"Internal: shared http/af stack for Dream (server) and Hyper (client)"
45
description: "This package does not have a stable API."
5-
6+
maintainer: ["Anton Bachin <antonbachin@yahoo.com>"]
7+
authors: ["Anton Bachin <antonbachin@yahoo.com>"]
68
license: "MIT"
79
homepage: "https://github.com/aantron/dream"
810
doc: "https://aantron.github.io/dream"
911
bug-reports: "https://github.com/aantron/dream/issues"
10-
dev-repo: "git+https://github.com/aantron/dream.git"
11-
12-
author: "Anton Bachin <antonbachin@yahoo.com>"
13-
maintainer: "Anton Bachin <antonbachin@yahoo.com>"
14-
1512
depends: [
13+
"dune" {>= "2.7"}
1614
"dream-pure"
17-
"dune" {>= "2.7.0"} # --instrument-with.
1815
"lwt"
1916
"lwt_ppx" {>= "1.2.2"}
2017
"lwt_ssl"
2118
"ocaml" {>= "4.08.0"}
22-
"ssl" {>= "0.5.8"} # Ssl.get_negotiated_alpn_protocol.
23-
24-
# Currently vendored.
25-
# "gluten"
26-
# "gluten-lwt-unix"
27-
# "httpaf"
28-
# "httpaf-lwt-unix"
29-
# "h2"
30-
# "h2-lwt-unix"
31-
# "hpack"
32-
# "websocketaf"
33-
34-
# Dependencies of vendored packages.
19+
"ssl" {>= "0.5.8"}
3520
"angstrom" {>= "0.14.0"}
3621
"base64" {>= "3.0.0"}
37-
"bigstringaf" {>= "0.5.0"} # h2.
38-
"digestif" {>= "0.7.2"} # websocket/af, sha1, default implementation.
22+
"bigstringaf" {>= "0.5.0"}
23+
"digestif" {>= "0.7.2"}
3924
"faraday" {>= "0.6.1"}
4025
"faraday-lwt-unix"
41-
"lwt_ssl" {>= "1.2.0"} # Gluten.
42-
"psq" # h2.
26+
"lwt_ssl" {>= "1.2.0"}
27+
"psq"
28+
"odoc" {with-doc}
4329
]
44-
4530
build: [
46-
["dune" "build" "-p" name "-j" jobs]
31+
["dune" "subst"] {dev}
32+
[
33+
"dune"
34+
"build"
35+
"-p"
36+
name
37+
"-j"
38+
jobs
39+
"@install"
40+
"@runtest" {with-test}
41+
"@doc" {with-doc}
42+
]
4743
]
44+
dev-repo: "git+https://github.com/aantron/dream.git"

‎dream-mirage.opam

+23-15
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1+
# This file is generated by dune, edit dune-project instead
12
opam-version: "2.0"
2-
33
synopsis: "Tidy, feature-complete Web framework"
4-
tags: ["http" "web" "framework" "websocket" "graphql" "server" "http2" "tls"]
5-
64
description: """
75
Dream is a feature-complete Web framework with a simple programming
86
model and no boilerplate. It provides only two data types, request and
@@ -29,34 +27,32 @@ Within this model, Dream adds:
2927
- Helpers for Web formats, such as Base64url, and a modern cipher.
3028

3129
Because of the simple programming model, everything is optional and
32-
composable. It is trivailly possible to strip Dream down to just a
30+
composable. It is trivially possible to strip Dream down to just a
3331
bare driver of the various HTTP protocols.
3432

3533
Dream is presented as a single module, whose API is documented on one
3634
page. In addition, Dream comes with a large number of examples.
3735
Security topics are introduced throughout, wherever they are
38-
applicable."""
39-
36+
applicable.
37+
"""
38+
maintainer: ["Anton Bachin <antonbachin@yahoo.com>"]
39+
authors: ["Anton Bachin <antonbachin@yahoo.com>"]
4040
license: "MIT"
41+
tags: ["http" "web" "framework" "websocket" "graphql" "server" "http2" "tls"]
4142
homepage: "https://github.com/aantron/dream"
4243
doc: "https://aantron.github.io/dream"
4344
bug-reports: "https://github.com/aantron/dream/issues"
44-
dev-repo: "git+https://github.com/aantron/dream.git"
45-
46-
author: "Anton Bachin <antonbachin@yahoo.com>"
47-
maintainer: "Anton Bachin <antonbachin@yahoo.com>"
48-
4945
depends: [
46+
"dune" {>= "2.7"}
5047
"bigarray-compat"
5148
"bigstringaf"
5249
"digestif" {>= "1.0.0"}
5350
"dream"
5451
"dream-httpaf"
5552
"dream-pure"
56-
"dune" {>= "2.7.0"}
5753
"duration"
5854
"emile" {>= "1.1"}
59-
"ke" {>= "0.4"} # paf.
55+
"ke" {>= "0.4"}
6056
"letsencrypt" {>= "0.3.0"}
6157
"lwt"
6258
"lwt_ppx" {>= "1.2.2"}
@@ -65,8 +61,20 @@ depends: [
6561
"rresult"
6662
"tcpip"
6763
"tls-mirage"
64+
"odoc" {with-doc}
6865
]
69-
7066
build: [
71-
["dune" "build" "-p" name "-j" jobs]
67+
["dune" "subst"] {dev}
68+
[
69+
"dune"
70+
"build"
71+
"-p"
72+
name
73+
"-j"
74+
jobs
75+
"@install"
76+
"@runtest" {with-test}
77+
"@doc" {with-doc}
78+
]
7279
]
80+
dev-repo: "git+https://github.com/aantron/dream.git"

‎dream-pure.opam

+22-16
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,41 @@
1+
# This file is generated by dune, edit dune-project instead
12
opam-version: "2.0"
2-
33
synopsis: "Internal: shared HTTP types for Dream (server) and Hyper (client)"
44
description: "This package does not have a stable API."
5-
5+
maintainer: ["Anton Bachin <antonbachin@yahoo.com>"]
6+
authors: ["Anton Bachin <antonbachin@yahoo.com>"]
67
license: "MIT"
78
homepage: "https://github.com/aantron/dream"
89
doc: "https://aantron.github.io/dream"
910
bug-reports: "https://github.com/aantron/dream/issues"
10-
dev-repo: "git+https://github.com/aantron/dream.git"
11-
12-
author: "Anton Bachin <antonbachin@yahoo.com>"
13-
maintainer: "Anton Bachin <antonbachin@yahoo.com>"
14-
1511
depends: [
16-
"base64" {>= "3.1.0"} # Base64.encode_string.
17-
"bigstringaf" {>= "0.5.0"} # Bigstringaf.to_string.
18-
"dune" {>= "2.7.0"} # --instrument-with.
12+
"dune" {>= "2.7"}
13+
"base64" {>= "3.1.0"}
14+
"bigstringaf" {>= "0.5.0"}
1915
"hmap"
2016
"lwt"
2117
"lwt_ppx" {>= "1.2.2"}
2218
"ocaml" {>= "4.08.0"}
23-
"ptime" {>= "0.8.1"} # Ptime.weekday.
19+
"ptime" {>= "0.8.1"}
2420
"uri" {>= "4.2.0"}
25-
26-
# Testing, development.
2721
"alcotest" {with-test}
28-
"bisect_ppx" {with-test & >= "2.5.0"} # --instrument-with.
22+
"bisect_ppx" {with-test & >= "2.5.0"}
2923
"ppx_expect" {with-test}
3024
"ppx_yojson_conv" {with-test}
25+
"odoc" {with-doc}
3126
]
32-
3327
build: [
34-
["dune" "build" "-p" name "-j" jobs]
28+
["dune" "subst"] {dev}
29+
[
30+
"dune"
31+
"build"
32+
"-p"
33+
name
34+
"-j"
35+
jobs
36+
"@install"
37+
"@runtest" {with-test}
38+
"@doc" {with-doc}
39+
]
3540
]
41+
dev-repo: "git+https://github.com/aantron/dream.git"

‎dream.opam

+32-25
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1+
# This file is generated by dune, edit dune-project instead
12
opam-version: "2.0"
2-
33
synopsis: "Tidy, feature-complete Web framework"
4-
tags: ["http" "web" "framework" "websocket" "graphql" "server" "http2" "tls"]
5-
64
description: """
75
Dream is a feature-complete Web framework with a simple programming
86
model and no boilerplate. It provides only two data types, request and
@@ -29,36 +27,35 @@ Within this model, Dream adds:
2927
- Helpers for Web formats, such as Base64url, and a modern cipher.
3028

3129
Because of the simple programming model, everything is optional and
32-
composable. It is trivailly possible to strip Dream down to just a
30+
composable. It is trivially possible to strip Dream down to just a
3331
bare driver of the various HTTP protocols.
3432

3533
Dream is presented as a single module, whose API is documented on one
3634
page. In addition, Dream comes with a large number of examples.
3735
Security topics are introduced throughout, wherever they are
38-
applicable."""
39-
36+
applicable.
37+
"""
38+
maintainer: ["Anton Bachin <antonbachin@yahoo.com>"]
39+
authors: ["Anton Bachin <antonbachin@yahoo.com>"]
4040
license: "MIT"
41+
tags: ["http" "web" "framework" "websocket" "graphql" "server" "http2" "tls"]
4142
homepage: "https://github.com/aantron/dream"
4243
doc: "https://aantron.github.io/dream"
4344
bug-reports: "https://github.com/aantron/dream/issues"
44-
dev-repo: "git+https://github.com/aantron/dream.git"
45-
46-
author: "Anton Bachin <antonbachin@yahoo.com>"
47-
maintainer: "Anton Bachin <antonbachin@yahoo.com>"
48-
4945
depends: [
46+
"dune" {>= "2.7"}
5047
"base-unix"
5148
"bigarray-compat"
5249
"camlp-streams"
5350
"caqti" {>= "2.0.0"}
5451
"caqti-lwt" {>= "2.0.0"}
55-
("conf-libev" {os != "win32"} | "ocaml" {os = "win32"})
52+
"conf-libev" {os != "win32"}
53+
"ocaml" {os = "win32"}
5654
"cstruct" {>= "6.0.0"}
57-
"digestif" {>= "0.7"} # to_raw_string.
55+
"digestif" {>= "0.7"}
5856
"dream-httpaf" {>= "1.0.0~alpha3"}
5957
"dream-pure" {>= "1.0.0~alpha2"}
60-
"dune" {>= "2.7.0"} # --instrument-with.
61-
"fmt" {>= "0.8.7"} # `Italic.
58+
"fmt" {>= "0.8.7"}
6259
"graphql_parser"
6360
"graphql-lwt"
6461
"lambdasoup" {>= "0.6.1"}
@@ -68,34 +65,44 @@ depends: [
6865
"logs" {>= "0.5.0"}
6966
"magic-mime"
7067
"markup" {>= "1.0.2"}
71-
"mirage-clock" {>= "3.0.0"} # now_d_ps : unit -> int * int64.
68+
"mirage-clock" {>= "3.0.0"}
7269
"mirage-crypto" {>= "1.0.0"}
7370
"mirage-crypto-rng" {>= "1.0.0"}
7471
"mirage-crypto-rng-lwt"
7572
"multipart_form" {>= "0.4.0"}
7673
"multipart_form-lwt"
7774
"ocaml" {>= "4.08.0"}
78-
"ptime" {>= "0.8.1"} # Ptime.v.
79-
"ssl" {>= "0.5.8"} # Ssl.get_negotiated_alpn_protocol.
75+
"ptime" {>= "0.8.1"}
76+
"ssl" {>= "0.5.8"}
8077
"uri" {>= "4.2.0"}
81-
"yojson" # ...
82-
83-
# Testing, development.
78+
"yojson"
8479
"alcotest" {with-test}
85-
"bisect_ppx" {with-test & >= "2.5.0"} # --instrument-with.
80+
"bisect_ppx" {with-test & >= "2.5.0"}
8681
"caqti-driver-postgresql" {with-test}
8782
"caqti-driver-sqlite3" {with-test}
8883
"crunch" {with-test}
8984
"html_of_jsx" {with-test}
9085
"js_of_ocaml" {with-test}
9186
"js_of_ocaml-ppx" {with-test}
92-
"ppx_expect" {with-test & >= "v0.15.0"} # Formatting changes.
87+
"ppx_expect" {with-test & >= "v0.15.0"}
9388
"ppx_yojson_conv" {with-test}
9489
"reason" {with-test}
9590
"tyxml" {with-test & >= "4.5.0"}
9691
"tyxml-jsx" {with-test}
92+
"odoc" {with-doc}
9793
]
98-
9994
build: [
100-
["dune" "build" "-p" name "-j" jobs]
95+
["dune" "subst"] {dev}
96+
[
97+
"dune"
98+
"build"
99+
"-p"
100+
name
101+
"-j"
102+
jobs
103+
"@install"
104+
"@runtest" {with-test}
105+
"@doc" {with-doc}
106+
]
101107
]
108+
dev-repo: "git+https://github.com/aantron/dream.git"

0 commit comments

Comments
 (0)