Merge pull request #600 from djs55/bump-ocaml

djs55 · web-flow · commit 44428dd66e02 · 2022-09-12T09:39:47.000+01:00
ocaml: bump to 4.14
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ depends:
 	opam install vpnkit alcotest ounit -y
 
 ocaml:
-	ocaml -version || opam init --compiler=4.12.0
+	ocaml -version || opam init --compiler=4.14.0
 	opam pin add vpnkit . -n
 
 depends:
diff --git a/scripts/licenses.ml b/scripts/licenses.ml
@@ -777,7 +777,7 @@ All rights reserved.
 
     |} ^ bsd_2_clause_simplified
   }
-  | "mirage-kv.4.0.0" | "mirage-kv.4.0.1" -> {
+  | "mirage-kv.4.0.0" | "mirage-kv.4.0.1" | "mirage-kv.5.0.0" -> {
     link = "https://github.com/mirage/mirage-kv/blob/5c2c75e5a0efc0c9390b11fab75b1e706ea8d4ab/LICENSE.md";
     text = isc
   }

Original file line number	Diff line number	Diff line change
`@@ -777,7 +777,7 @@ All rights reserved.`
`777`	`777`
`778`	`778`	`\|} ^ bsd_2_clause_simplified`
`779`	`779`	`}`
`780`		`- \| "mirage-kv.4.0.0" \| "mirage-kv.4.0.1" -> {`
	`780`	`+ \| "mirage-kv.4.0.0" \| "mirage-kv.4.0.1" \| "mirage-kv.5.0.0" -> {`
`781`	`781`	`link = "https://github.com/mirage/mirage-kv/blob/5c2c75e5a0efc0c9390b11fab75b1e706ea8d4ab/LICENSE.md";`
`782`	`782`	`text = isc`
`783`	`783`	`}`