Skip to content

Commit e7db5b9

Browse files
smorimotosmorimoto
committed
dune: enable generate_opam_files option
Signed-off-by: Sora Morimoto <[email protected]>
1 parent 519c576 commit e7db5b9

File tree

3 files changed

+140
-57
lines changed

3 files changed

+140
-57
lines changed

Diff for: ‎.github/workflows/main.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
os:
18-
- macos-latest
1918
- ubuntu-latest
19+
- macos-latest
20+
- windows-latest
2021
ocaml-compiler:
2122
- 5
2223
- 4
@@ -60,10 +61,9 @@ jobs:
6061
- name: Set-up OCaml
6162
uses: ocaml/setup-ocaml@v3
6263
with:
63-
ocaml-compiler: 4
64-
opam-pin: false
64+
ocaml-compiler: 5
6565

66-
- run: opam install mirage
66+
- run: opam install "mirage<4.7.0"
6767
- run: opam exec -- mirage configure -t ${{ matrix.mode }}
6868
- run: opam exec -- make depend
6969
- run: opam exec -- make

Diff for: ‎dune-project

+67
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,70 @@
11
(lang dune 2.7)
2+
23
(name tcpip)
4+
35
(formatting disabled)
6+
(generate_opam_files true)
7+
8+
(license ISC)
9+
(authors
10+
"Anil Madhavapeddy"
11+
"Balraj Singh"
12+
"David Scott"
13+
"Gabor Pali"
14+
"Hannes Mehnert"
15+
"Haris Rotsos"
16+
"Kia"
17+
"Luke Dunstan"
18+
"Magnus Skjegstad"
19+
"Mindy Preston"
20+
"Nicolas Ojeda Bar"
21+
"Pablo Polvorin"
22+
"Richard Mortier"
23+
"Thomas Gazagnaire"
24+
"Thomas Leonard"
25+
"Tim Cuthbertson"
26+
"Vincent Bernardoff"
27+
"lnmx"
28+
"pqwy")
29+
(maintainers "[email protected]")
30+
(source (github mirage/mirage-tcpip))
31+
32+
(package
33+
(name tcpip)
34+
(synopsis "OCaml TCP/IP networking stack, used in MirageOS")
35+
(description "`mirage-tcpip` provides a networking stack for the [Mirage operating system](https://mirage.io). It provides implementations for the following module types (which correspond with the similarly-named protocols): IP (via the IPv4 and IPv6 modules), ICMP, UDP, TCP")
36+
(tags ("org:mirage"))
37+
(depends
38+
(ocaml (>= 4.08.0))
39+
(arp (>= 3.0.0))
40+
(cmdliner (>= 1.1.0))
41+
(cstruct (>= 6.0.0))
42+
cstruct-lwt
43+
duration
44+
(ethernet (>= 3.0.0))
45+
(fmt (>= 0.8.7))
46+
(ipaddr (>= 5.6.0))
47+
ipaddr-cstruct
48+
(logs (>= 0.6.0))
49+
(lru (>= 0.3.0))
50+
(lwt (>= 4.0.0))
51+
lwt-dllist
52+
(macaddr (>= 4.0.0))
53+
macaddr-cstruct
54+
metrics
55+
(mirage-clock (>= 3.0.0))
56+
(mirage-crypto-rng-mirage (>= 1.0.0))
57+
(mirage-flow (>= 4.0.0))
58+
(mirage-net (>= 3.0.0))
59+
(mirage-time (>= 2.0.0))
60+
(randomconv (>= 0.2.0))
61+
(bisect_ppx (and :dev (> 2.5.0)))
62+
(alcotest (and :with-test (>= 1.5.0)))
63+
(mirage-clock-unix (and :with-test (>= 3.0.0)))
64+
(mirage-crypto-rng (and :with-test (>= 1.0.0)))
65+
(mirage-vnetif (and :with-test (>= 0.6.2)))
66+
(pcap-format :with-test))
67+
(conflicts
68+
ocaml-freestanding
69+
(mirage-xen (< 6.0.0))
70+
(result (< 1.5))))

Diff for: ‎tcpip.opam

+69-53
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,84 @@
1+
# This file is generated by dune, edit dune-project instead
12
opam-version: "2.0"
2-
maintainer: "[email protected]"
3-
homepage: "https://github.com/mirage/mirage-tcpip"
4-
dev-repo: "git+https://github.com/mirage/mirage-tcpip.git"
5-
bug-reports: "https://github.com/mirage/mirage-tcpip/issues"
6-
doc: "https://mirage.github.io/mirage-tcpip/"
3+
synopsis: "OCaml TCP/IP networking stack, used in MirageOS"
4+
description:
5+
"`mirage-tcpip` provides a networking stack for the [Mirage operating system](https://mirage.io). It provides implementations for the following module types (which correspond with the similarly-named protocols): IP (via the IPv4 and IPv6 modules), ICMP, UDP, TCP"
6+
maintainer: ["[email protected]"]
77
authors: [
8-
"Anil Madhavapeddy" "Balraj Singh" "Richard Mortier" "Nicolas Ojeda Bar"
9-
"Thomas Gazagnaire" "Vincent Bernardoff" "Magnus Skjegstad" "Mindy Preston"
10-
"Thomas Leonard" "David Scott" "Gabor Pali" "Hannes Mehnert" "Haris Rotsos"
11-
"Kia" "Luke Dunstan" "Pablo Polvorin" "Tim Cuthbertson" "lnmx" "pqwy" ]
8+
"Anil Madhavapeddy"
9+
"Balraj Singh"
10+
"David Scott"
11+
"Gabor Pali"
12+
"Hannes Mehnert"
13+
"Haris Rotsos"
14+
"Kia"
15+
"Luke Dunstan"
16+
"Magnus Skjegstad"
17+
"Mindy Preston"
18+
"Nicolas Ojeda Bar"
19+
"Pablo Polvorin"
20+
"Richard Mortier"
21+
"Thomas Gazagnaire"
22+
"Thomas Leonard"
23+
"Tim Cuthbertson"
24+
"Vincent Bernardoff"
25+
"lnmx"
26+
"pqwy"
27+
]
1228
license: "ISC"
1329
tags: ["org:mirage"]
14-
15-
build: [
16-
["dune" "subst"] {dev}
17-
["dune" "build" "-p" name "-j" jobs]
18-
["dune" "runtest" "-p" name "-j" jobs] {with-test}
19-
]
20-
conflicts: [
21-
"mirage-xen" {< "6.0.0"}
22-
"ocaml-freestanding"
23-
"result" {< "1.5"}
24-
]
30+
homepage: "https://github.com/mirage/mirage-tcpip"
31+
bug-reports: "https://github.com/mirage/mirage-tcpip/issues"
2532
depends: [
26-
"dune" {>= "2.7.0"}
27-
"bisect_ppx" {dev & >= "2.5.0"}
33+
"dune" {>= "2.7"}
2834
"ocaml" {>= "4.08.0"}
35+
"arp" {>= "3.0.0"}
36+
"cmdliner" {>= "1.1.0"}
2937
"cstruct" {>= "6.0.0"}
3038
"cstruct-lwt"
31-
"mirage-net" {>= "3.0.0"}
32-
"mirage-clock" {>= "3.0.0"}
33-
"mirage-crypto-rng-mirage" {>= "1.0.0"}
34-
"mirage-time" {>= "2.0.0"}
35-
"ipaddr" {>= "5.6.0"}
36-
"macaddr" {>="4.0.0"}
37-
"macaddr-cstruct"
39+
"duration"
40+
"ethernet" {>= "3.0.0"}
3841
"fmt" {>= "0.8.7"}
42+
"ipaddr" {>= "5.6.0"}
43+
"ipaddr-cstruct"
44+
"logs" {>= "0.6.0"}
45+
"lru" {>= "0.3.0"}
3946
"lwt" {>= "4.0.0"}
4047
"lwt-dllist"
41-
"logs" {>= "0.6.0"}
42-
"duration"
43-
"randomconv" {>= "0.2.0"}
44-
"ethernet" {>= "3.0.0"}
45-
"arp" {>= "3.0.0"}
48+
"macaddr" {>= "4.0.0"}
49+
"macaddr-cstruct"
50+
"metrics"
51+
"mirage-clock" {>= "3.0.0"}
52+
"mirage-crypto-rng-mirage" {>= "1.0.0"}
4653
"mirage-flow" {>= "4.0.0"}
47-
"mirage-vnetif" {with-test & >= "0.6.2"}
48-
"alcotest" {with-test & >="1.5.0"}
49-
"pcap-format" {with-test}
54+
"mirage-net" {>= "3.0.0"}
55+
"mirage-time" {>= "2.0.0"}
56+
"randomconv" {>= "0.2.0"}
57+
"bisect_ppx" {dev & > "2.5.0"}
58+
"alcotest" {with-test & >= "1.5.0"}
5059
"mirage-clock-unix" {with-test & >= "3.0.0"}
5160
"mirage-crypto-rng" {with-test & >= "1.0.0"}
52-
"ipaddr-cstruct"
53-
"macaddr-cstruct"
54-
"lru" {>= "0.3.0"}
55-
"metrics"
56-
"cmdliner" {>= "1.1.0"}
61+
"mirage-vnetif" {with-test & >= "0.6.2"}
62+
"pcap-format" {with-test}
63+
"odoc" {with-doc}
5764
]
58-
synopsis: "OCaml TCP/IP networking stack, used in MirageOS"
59-
description: """
60-
`mirage-tcpip` provides a networking stack for the [Mirage operating
61-
system](https://mirage.io). It provides implementations for the following module types
62-
(which correspond with the similarly-named protocols):
63-
64-
* IP (via the IPv4 and IPv6 modules)
65-
* ICMP
66-
* UDP
67-
* TCP
68-
"""
65+
conflicts: [
66+
"ocaml-freestanding"
67+
"mirage-xen" {< "6.0.0"}
68+
"result" {< "1.5"}
69+
]
70+
build: [
71+
["dune" "subst"] {dev}
72+
[
73+
"dune"
74+
"build"
75+
"-p"
76+
name
77+
"-j"
78+
jobs
79+
"@install"
80+
"@runtest" {with-test}
81+
"@doc" {with-doc}
82+
]
83+
]
84+
dev-repo: "git+https://github.com/mirage/mirage-tcpip.git"

0 commit comments

Comments
 (0)