Merge pull request #131 from djs55/unix

Remove unnecessary Unix dependency
mirage · Sep 15, 2017 · b7cdf99 · b7cdf99
2 parents 85393d7 + 4eff374
commit b7cdf99
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+## v0.11.3 (2017-09-15)
+
+* Remove unnecessary Unix dependency from core library
+
 ## v0.11.2 (2016-06-17)
 * Add dependency on io-page-unix
 * Modernise travis and appveyor

diff --git a/lib/jbuild b/lib/jbuild
@@ -3,6 +3,6 @@
 (library
  ((name        protocol_9p)
   (public_name protocol-9p)
-  (libraries   (result rresult cstruct cstruct-lwt sexplib lwt mirage-flow-lwt mirage-channel-lwt mirage-kv-lwt astring fmt))
+  (libraries   (result rresult cstruct sexplib lwt mirage-flow-lwt mirage-channel-lwt mirage-kv-lwt astring fmt))
   (preprocess (pps (ppx_sexp_conv)))
 ))
diff --git a/protocol-9p-unix.opam b/protocol-9p-unix.opam
@@ -15,7 +15,8 @@ depends: [
   "jbuilder" {build & >="1.0+beta10"}
   "protocol-9p"
   "base-bytes"
-  "cstruct" {>= "1.9.0"}
+  "cstruct" {>= "3.0.0"}
+  "cstruct-lwt" {>= "3.0.0"}
   "sexplib" {> "113.00.00" }
   "prometheus"
   "result"

diff --git a/protocol-9p.opam b/protocol-9p.opam
@@ -15,15 +15,13 @@ depends: [
   "jbuilder" {build & >= "1.0+beta10"}
   "base-bytes"
   "cstruct" {>= "3.0.0"}
-  "cstruct-lwt" {>= "3.0.0"}
   "sexplib" {> "113.00.00"}
   "result"
   "rresult"
   "mirage-flow-lwt"
   "mirage-kv-lwt"
   "mirage-channel-lwt"
   "lwt" {>= "3.0.0"}
-  "base-unix"
   "cmdliner"
   "astring"
   "named-pipe" {>= "0.4.0"}

diff --git a/unix/jbuild b/unix/jbuild
@@ -3,6 +3,6 @@
 (library
  ((name        protocol_9p_unix)
   (public_name protocol-9p-unix)
-  (libraries   (result fmt lwt mirage-flow-lwt cstruct astring named-pipe.lwt
+  (libraries   (result fmt lwt mirage-flow-lwt cstruct cstruct-lwt astring named-pipe.lwt
                 protocol-9p io-page.unix prometheus))
 ))