remove tcpip.unix dependency, which is now superfluous

hannesm · Mar 30, 2021 · 977b8dd · 977b8dd
1 parent 102075d
commit 977b8dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,7 @@
 
 * Adapt to conduit 2.3 and cohttp 4.0 (@samoht @dinosaure #1209)
 * Allow mirage-crypto-rng-mirage 0.9 (@hannesm #1218)
+* Adapt to tcpip 6.1.0 release (the unix sublibrary is no longer needed)
 
 ### v3.10.1 (2020-12-04)
 

diff --git a/lib/mirage_impl_ip.ml b/lib/mirage_impl_ip.ml
@@ -37,12 +37,8 @@ let (@??) x y = opt_map Key.abstract x @? y
 
 (* convenience function for linking tcpip.unix for checksums *)
 let right_tcpip_library ?ocamlfind ~sublibs pkg =
-  let min = "6.0.0" and max = "7.0.0" in
-  Key.match_ Key.(value target) @@ function
-  | #Mirage_key.mode_unix ->
-    [ package ~min ~max ?ocamlfind ~sublibs:("unix"::sublibs) pkg ]
-  | #Mirage_key.mode_xen | #Mirage_key.mode_solo5 ->
-    [ package ~min ~max ?ocamlfind ~sublibs pkg ]
+  let min = "6.1.0" and max = "7.0.0" in
+  [ package ~min ~max ?ocamlfind ~sublibs pkg ]
 
 let ipv4_keyed_conf ~ip ?gateway ?no_init () = impl @@ object
     inherit base_configurable