From 1df0532b6894687d2e0726a5bd7a24d52c984e7d Mon Sep 17 00:00:00 2001
From: David Scott <dave@recoil.org>
Date: Tue, 5 Apr 2022 09:00:17 +0100
Subject: [PATCH 1/2] opam: pin package versions to last successful Windows
 build

Signed-off-by: David Scott <dave@recoil.org>
---
 vpnkit.opam | 80 ++++++++++++++++++++++++++---------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/vpnkit.opam b/vpnkit.opam
index 3c9b1d915..efca5da2f 100644
--- a/vpnkit.opam
+++ b/vpnkit.opam
@@ -23,48 +23,48 @@ build: [
 
 depends: [
   "ocaml"
-  "dune" {build}
+  "dune" {build & = "3.0.3"}
   "alcotest" {with-test}
   "ounit" {with-test}
-  "result"
-  "tar" {>= "1.0.1"}
-  "ipaddr" {>= "5.0.1"}
-  "lwt" {>= "5.4.0"}
-  "uwt" {>= "0.0.4"}
-  "tcpip" {>= "7.0.0"}
-  "base64" {>= "3.5.0"}
-  "cstruct" {>= "6.0.0"}
-  "pcap-format" {>= "0.4.0"}
-  "cmdliner"
-  "charrua" {>= "1.3.0"}
-  "charrua-client"
-  "charrua-server"
-  "hvsock" {>= "2.0.0"}
-  "fd-send-recv" {>= "2.0.0"}
-  "logs"
-  "fmt"
-  "astring"
-  "ethernet" {>= "3.0.0"}
-  "arp" {>= "3.0.0"}
-  "mirage-entropy" {>= "0.5.0"}
-  "mirage-kv" {>= "4.0.0"}
-  "mirage-net" {>= "4.0.0"}
-  "mirage-time" {>= "3.0.0"}
-  "mirage-channel" {>= "4.0.1"}
-  "mirage-stack"
-  "cohttp-lwt" {>= "0.99.0"}
-  "protocol-9p" {>= "2.0.0"}
-  "mirage-vnetif" {>= "0.5.0"}
-  "io-page-unix"
-  "uuidm"
-  "ezjsonm" {>= "0.4.0"}
-  "sha"
-  "stringext"
-  "mirage-clock" {>= "4.0.0"}
-  "mirage-clock-unix" {>= "4.0.0"}
-  "mirage-random" {>= "3.0.0"}
-  "mirage-random-stdlib"
-  "re" {>= "1.9.0"}
+  "result" {= "1.5"}
+  "tar" {= "2.0.1"}
+  "ipaddr" {= "5.3.0"}
+  "lwt" {= "5.5.0"}
+  "uwt" {= "0.3.3"}
+  "tcpip" {= "7.1.0"}
+  "base64" {= "3.5.0"}
+  "cstruct" {= "6.0.1"}
+  "pcap-format" {= "0.5.2"}
+  "cmdliner" {= "1.0.4"}
+  "charrua" {= "1.5.0"}
+  "charrua-client" {= "1.5.0"}
+  "charrua-server" {= "1.5.0"}
+  "hvsock" {= "3.0.0"}
+  "fd-send-recv" {= "2.0.1"}
+  "logs" {= "0.7.0"}
+  "fmt" {= "0.9.0"}
+  "astring" {= "0.8.5"}
+  "ethernet" {= "3.0.0"}
+  "arp" {= "3.0.0"}
+  "mirage-entropy" {= "0.5.0"}
+  "mirage-kv" {= "4.0.1"}
+  "mirage-net" {= "4.0.0"}
+  "mirage-time" {= "3.0.0"}
+  "mirage-channel" {= "4.0.1"}
+  "mirage-stack" {= "4.0.0"}
+  "cohttp-lwt" {= "5.0.0"}
+  "protocol-9p" {= "2.0.2"}
+  "mirage-vnetif" {= "0.6.0"}
+  "io-page-unix" {= "2.3.0"}
+  "uuidm" {= "0.9.7"}
+  "ezjsonm" {= "1.3.0"}
+  "sha" {= "1.15.2"}
+  "stringext" {= "1.6.0"}
+  "mirage-clock" {= "4.2.0"}
+  "mirage-clock-unix" {= "4.2.0"}
+  "mirage-random" {= "3.0.0"}
+  "mirage-random-stdlib" {= "0.1.0"}
+  "re" {= "1.10.3"}
 ]
 synopsis: "VPN-friendly networking devices for HyperKit"
 description: """

From e59b3214ac84aaeb6f33ad838ad67fd374845b59 Mon Sep 17 00:00:00 2001
From: David Scott <dave@recoil.org>
Date: Tue, 5 Apr 2022 09:45:30 +0100
Subject: [PATCH 2/2] make: opam update in depends

Signed-off-by: David Scott <dave@recoil.org>
---
 Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index ccbff4004..07f1156b0 100644
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,6 @@ build: vpnkit.exe
 vpnkit.exe:
 	opam exec -- dune build --profile release
 
-depends:
-	opam install vpnkit alcotest ounit -y
-
 ocaml:
 	ocaml -version || opam init --compiler=4.12.0
 	# Can be removed after we upgrade tcpip
@@ -19,6 +16,7 @@ ocaml:
 	opam pin add vpnkit . -n
 
 depends:
+	opam update
 	opam install --deps-only -t vpnkit
 
 test: