diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-08-27 19:00:55 +0000 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-08-27 20:03:06 +0000 |
commit | 724504e0da4b6491dbc2517c685d65cf7f4f4134 (patch) | |
tree | d28104a8dcd77f3fbdd0501f69232ead88880158 /pkgs/development/ocaml-modules/conduit | |
parent | f5068aadd9d62563d77a32486996467e69cabe36 (diff) | |
download | nixlib-724504e0da4b6491dbc2517c685d65cf7f4f4134.tar nixlib-724504e0da4b6491dbc2517c685d65cf7f4f4134.tar.gz nixlib-724504e0da4b6491dbc2517c685d65cf7f4f4134.tar.bz2 nixlib-724504e0da4b6491dbc2517c685d65cf7f4f4134.tar.lz nixlib-724504e0da4b6491dbc2517c685d65cf7f4f4134.tar.xz nixlib-724504e0da4b6491dbc2517c685d65cf7f4f4134.tar.zst nixlib-724504e0da4b6491dbc2517c685d65cf7f4f4134.zip |
ocamlPackages.cohttp: 0.22.0 -> 0.99.0
ocamlPackages.conduit: 0.15.4 -> 1.0.0 ocamlPackages.cohttp-lwt: init at 0.99.0 ocamlPackages.cohttp-lwt-unix: init at 0.99.0 ocamlPackages.conduit-lwt: init at 1.0.0 ocamlPackages.conduit-lwt-unix: init at 1.0.0 ocamlPackages.git: 1.11.1 -> 1.11.2
Diffstat (limited to 'pkgs/development/ocaml-modules/conduit')
-rw-r--r-- | pkgs/development/ocaml-modules/conduit/default.nix | 22 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/conduit/lwt-unix.nix | 18 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/conduit/lwt.nix | 16 |
3 files changed, 44 insertions, 12 deletions
diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 750bded28938..98ac997383c7 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,27 +1,25 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild -, ppx_driver, ppx_sexp_conv -, ipaddr, uri, logs -, ocaml_lwt ? null -, async ? null, async_ssl ? null -, tls ? null +{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder +, ppx_sexp_conv +, astring, ipaddr, uri }: stdenv.mkDerivation rec { - version = "0.15.4"; + version = "1.0.0"; name = "ocaml${ocaml.version}-conduit-${version}"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-conduit"; rev = "v${version}"; - sha256 = "1ya7jqvhl8hc22cid5myf31w5c473imdxjnl9785lavsqj3djjxq"; + sha256 = "1ryigzh7sfif1mly624fpm87aw5h60n5wzdlrvqsf71qcpxc6iiz"; }; - buildInputs = [ ocaml findlib ocamlbuild ppx_driver ppx_sexp_conv - ocaml_lwt async async_ssl tls ]; - propagatedBuildInputs = [ ipaddr uri logs ]; + buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ]; + propagatedBuildInputs = [ astring ipaddr uri ]; - createFindlibDestdir = true; + buildPhase = "jbuilder build -p conduit"; + + inherit (jbuilder) installPhase; meta = { description = "Network connection library for TCP and SSL"; diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix new file mode 100644 index 000000000000..ce7a33a11eed --- /dev/null +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -0,0 +1,18 @@ +{ stdenv, ocaml, findlib, jbuilder, conduit-lwt +, logs, ppx_sexp_conv +}: + +if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0" +then conduit-lwt +else + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-conduit-lwt-unix-${version}"; + inherit (conduit-lwt) version src installPhase meta; + + buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ]; + + propagatedBuildInputs = [ conduit-lwt logs ]; + + buildPhase = "jbuilder build -p conduit-lwt-unix"; +} diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix new file mode 100644 index 000000000000..8ee3d827ecc1 --- /dev/null +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -0,0 +1,16 @@ +{ stdenv, ocaml, findlib, jbuilder, ppx_sexp_conv, conduit, lwt3 }: + +if !stdenv.lib.versionAtLeast conduit.version "1.0" +then conduit +else + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-conduit-lwt-${version}"; + inherit (conduit) version src installPhase meta; + + buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ]; + + propagatedBuildInputs = [ conduit lwt3 ]; + + buildPhase = "jbuilder build -p conduit-lwt"; +} |