Skip to content

Commit 604ab7f

Browse files
authored
Merge pull request #642 from avsm/fix-build
Fix build with latest dune
2 parents f6723dd + c7672f7 commit 604ab7f

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

scripts/licenses.ml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ src/arp_packet.ml mirage/arpv4.mli mirage/arpv4.ml
525525
Copyright (c) 2013-2016 Jeremy Yallop
526526
|} ^ mit
527527
}
528-
| "ctypes.0.20.1" | "ctypes.0.22.0" -> {
528+
| "ctypes.0.20.1" | "ctypes.0.22.0" | "ctypes.0.23.0" -> {
529529
link = "https://raw.githubusercontent.com/ocamllabs/ocaml-ctypes/master/LICENSE";
530530
text = {|
531531
Copyright (c) 2013 Jeremy Yallop
@@ -546,9 +546,9 @@ src/arp_packet.ml mirage/arpv4.mli mirage/arpv4.ml
546546
| "jst-config.v0.14.1"
547547
| "jane-street-headers.v0.14.0"
548548
| "base.v0.14.2" | "base.v0.14.3"
549-
| "csexp.1.5.1"
550-
| "dune.2.9.1" | "dune.2.9.2" | "dune.2.9.3" | "dune.3.0.2" | "dune.3.0.3" | "dune.3.1.1" | "dune.3.2.0" | "dune.3.3.0" | "dune.3.4.1" | "dune.3.5.0"
551-
| "dune-configurator.2.9.1" | "dune-configurator.2.9.3" | "dune-configurator.3.0.2" | "dune-configurator.3.0.3" | "dune-configurator.3.1.1" | "dune-configurator.3.3.0" | "dune-configurator.3.5.0"
549+
| "csexp.1.5.1" | "csexp.1.5.2"
550+
| "dune.2.9.1" | "dune.2.9.2" | "dune.2.9.3" | "dune.3.0.2" | "dune.3.0.3" | "dune.3.1.1" | "dune.3.2.0" | "dune.3.3.0" | "dune.3.4.1" | "dune.3.5.0" | "dune.3.16.0"
551+
| "dune-configurator.2.9.1" | "dune-configurator.2.9.3" | "dune-configurator.3.0.2" | "dune-configurator.3.0.3" | "dune-configurator.3.1.1" | "dune-configurator.3.3.0" | "dune-configurator.3.5.0" | "dune-configurator.3.16.0"
552552
| "dune-configurator.3.2.0" | "dune-configurator.3.4.1"
553553
| "ocaml-compiler-libs.v0.12.4"
554554
| "ocaml-syntax-shims.1.0.0"
@@ -911,6 +911,8 @@ the license in file toplevel/LICENSE-findlib.
911911
| "ocaml.4.13.0" | "ocaml-base-compiler.4.13.0"
912912
| "ocaml.4.13.1" | "ocaml-base-compiler.4.13.1"
913913
| "ocaml.4.14.0" | "ocaml-base-compiler.4.14.0"
914+
| "ocaml.4.14.1" | "ocaml-base-compiler.4.14.1"
915+
| "ocaml.4.14.2" | "ocaml-base-compiler.4.14.2"
914916
| "ocaml-variants.4.08.0+mingw64c"
915917
| "ocaml-variants.4.13.1+mingw64c"
916918
| "seq.base" | "stdlib-shims.0.3.0" | "uchar.0.0.2" -> {
@@ -1116,7 +1118,7 @@ Copyright (c) 2016-2017 Mindy Preston
11161118
|} ^ isc
11171119
11181120
}
1119-
| "vpnkit.0.2.0" -> {
1121+
| "vpnkit.0.2.0" | "vpnkit.0.5.0" -> {
11201122
link = "https://github.com/moby/vpnkit/blob/master/LICENSE";
11211123
text = apache2 "Copyright 2013-2016 Docker, Inc."
11221124
}

vpnkit.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ build: [
2424

2525
depends: [
2626
"ocaml" {>="4.08.0"}
27-
"dune" {build & < "3.1.0" }
27+
"dune" {>= "3.0"}
2828
"alcotest" {with-test}
2929
"ounit" {with-test}
3030
"tar" {>= "1.0.1"}

0 commit comments

Comments
 (0)