Fixup dependencies to only require mirage-types, and update opam file

.travis-ci.sh

@@ -24,6 +24,7 @@ opam init git://github.com/ocaml/opam-repository >/dev/null 2>&1
 opam pin dns .
 opam install base64 # can remove with opam 1.2?
 opam install dns
+opam install mirage-types
 
 eval `opam config env`
 make clean

_oasis

@@ -51,8 +51,8 @@ Library "dns-lwt-mirage"
   Install$: flag(mirage)
   Findlibname: mirage
   Modules: Dns_resolver_mirage
-  BuildDepends: cstruct, lwt.syntax, dns, dns.lwt-core, tcpip
-  XMetaRequires: cstruct, dns, dns.lwt-core, tcpip
+  BuildDepends: cstruct, lwt.syntax, dns, dns.lwt-core, mirage-types
+  XMetaRequires: cstruct, dns, dns.lwt-core, tcpip, mirage-types
   FindlibParent: dns
 
 Library "dns-lwt-core"

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 1fef36b7982b7347691d423e55c4d237)
+# DO NOT EDIT (digest: 01e1e00de7c9151fbae51f051fe19139)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -47,9 +47,9 @@
 <mirage/*.ml{,i}>: package(ipaddr)
 <mirage/*.ml{,i}>: package(lwt)
 <mirage/*.ml{,i}>: package(lwt.syntax)
+<mirage/*.ml{,i}>: package(mirage-types)
 <mirage/*.ml{,i}>: package(re)
 <mirage/*.ml{,i}>: package(re.str)
-<mirage/*.ml{,i}>: package(tcpip)
 <mirage/*.ml{,i}>: use_dns
 <mirage/*.ml{,i}>: use_dns-lwt-core
 # Library dns-lwt

lib/META

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 08bd769e2c3d4771dc74405b93faba62)
+# DO NOT EDIT (digest: 091f1136c6b7434d40d95cb3bb6436e8)
 version = "0.10.0"
 description = "DNS client and server implementation"
 requires = "cstruct re re.str ipaddr io-page base64"
@@ -11,7 +11,7 @@ exists_if = "dns.cma"
 package "mirage" (
  version = "0.10.0"
  description = "DNS client and server implementation"
- requires = "cstruct dns dns.lwt-core tcpip"
+ requires = "cstruct dns dns.lwt-core tcpip mirage-types"
  archive(byte) = "dns-lwt-mirage.cma"
  archive(byte, plugin) = "dns-lwt-mirage.cma"
  archive(native) = "dns-lwt-mirage.cmxa"

opam

@@ -15,7 +15,7 @@ tags: [
   "org:xapi-project"
 ]
 build: [
-  ["ocaml" "setup.ml" "-configure" "--prefix" prefix "--%{base-unix:enable}%-lwt"]
+  ["ocaml" "setup.ml" "-configure" "--prefix" prefix "--%{base-unix:enable}%-lwt" "--%{mirage-types:enable}%-mirage"]
   ["ocaml" "setup.ml" "-build"]
   ["ocaml" "setup.ml" "-install"]
 ]
@@ -30,4 +30,8 @@ depends: [
   "io-page"
   "base64"
 ]
+depopts: [
+  "mirage-types"
+]
+conflicts: ["mirage-types" {<"1.2.0"}]
 ocaml-version: [>= "4.00.0"]

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.4 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: b0d7535f56218854326dc50bcf3f005c) *)
+(* DO NOT EDIT (digest: 2264d1da5862fa5281b54b484bf81e81) *)
 (*
    Regenerated by OASIS v0.4.4
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -7068,7 +7068,7 @@ let setup_t =
                            FindlibPackage ("lwt.syntax", None);
                            InternalLibrary "dns";
                            InternalLibrary "dns-lwt-core";
-                           FindlibPackage ("tcpip", None)
+                           FindlibPackage ("mirage-types", None)
                         ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
                       bs_c_sources = [];
@@ -7349,7 +7349,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.4";
-     oasis_digest = Some "\248\183x*f\015\216\155\143f\n\200\199\179\005\250";
+     oasis_digest = Some "\138v%\146srRÆå¤ñüøuíp";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false