From 3fd892fde323b7a3764e6cc7a7ed090e09ece048 Mon Sep 17 00:00:00 2001 From: David Scott Date: Fri, 15 Sep 2017 15:23:23 +0100 Subject: [PATCH 1/2] cstruct-lwt (depends on lwt.unix) is needed by the unix subpackage This patch moves the Unix dependency to where it's needed. Signed-off-by: David Scott --- lib/jbuild | 2 +- protocol-9p-unix.opam | 3 ++- protocol-9p.opam | 2 -- unix/jbuild | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/jbuild b/lib/jbuild index c44071b..941bde4 100644 --- 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 index fed0d08..830ecc8 100644 --- 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 index 17b97d4..624d6c4 100644 --- a/protocol-9p.opam +++ b/protocol-9p.opam @@ -15,7 +15,6 @@ depends: [ "jbuilder" {build & >= "1.0+beta10"} "base-bytes" "cstruct" {>= "3.0.0"} - "cstruct-lwt" {>= "3.0.0"} "sexplib" {> "113.00.00"} "result" "rresult" @@ -23,7 +22,6 @@ depends: [ "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 index 926e38c..8cb203e 100644 --- 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)) )) From 4eff37440da751f2a32ae2b38a81d978ceb37ee8 Mon Sep 17 00:00:00 2001 From: David Scott Date: Fri, 15 Sep 2017 15:25:53 +0100 Subject: [PATCH 2/2] Prepare to release v0.11.3 Signed-off-by: David Scott --- CHANGES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 1b53dca..cb6fec9 100644 --- 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