diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-01 10:18:34 +0000 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-01 11:52:18 +0000 |
commit | fe9147a042f83b7700da92f0680cfb7438997ac3 (patch) | |
tree | 6a5434adf76f82e8fa7806a502ff8002d4d8bc7d /pkgs/development/ocaml-modules/conduit | |
parent | 352d487101eded14fd4f592f4d4909017187f0d6 (diff) | |
download | nixlib-fe9147a042f83b7700da92f0680cfb7438997ac3.tar nixlib-fe9147a042f83b7700da92f0680cfb7438997ac3.tar.gz nixlib-fe9147a042f83b7700da92f0680cfb7438997ac3.tar.bz2 nixlib-fe9147a042f83b7700da92f0680cfb7438997ac3.tar.lz nixlib-fe9147a042f83b7700da92f0680cfb7438997ac3.tar.xz nixlib-fe9147a042f83b7700da92f0680cfb7438997ac3.tar.zst nixlib-fe9147a042f83b7700da92f0680cfb7438997ac3.zip |
ocamlPackages.conduit: 0.10.0 -> 0.15.4
Keeping the old version under attribute conduit_p4.
Diffstat (limited to 'pkgs/development/ocaml-modules/conduit')
-rw-r--r-- | pkgs/development/ocaml-modules/conduit/0.10.0.nix | 26 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/conduit/default.nix | 47 |
2 files changed, 53 insertions, 20 deletions
diff --git a/pkgs/development/ocaml-modules/conduit/0.10.0.nix b/pkgs/development/ocaml-modules/conduit/0.10.0.nix new file mode 100644 index 000000000000..4d1c43e0ae18 --- /dev/null +++ b/pkgs/development/ocaml-modules/conduit/0.10.0.nix @@ -0,0 +1,26 @@ +{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr_p4 +, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" +, async_p4 ? null, async_ssl_p4 ? null, lwt ? null +}: + +buildOcaml rec { + name = "conduit"; + version = "0.10.0"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-conduit/archive/v${version}.tar.gz"; + sha256 = "1jz2skzsyg0axlkk9s6ahfblfrjx599wisyfs0cvn5dik9jqjadh"; + }; + + propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr_p4 ]; + buildInputs = stdenv.lib.optional (lwt != null) lwt + ++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4 + ++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4; + + meta = with stdenv.lib; { + homepage = https://github.com/mirage/ocaml-conduit; + description = "Resolve URIs into communication channels for Async or Lwt "; + license = licenses.mit; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 4d1c43e0ae18..750bded28938 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,26 +1,33 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr_p4 -, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" -, async_p4 ? null, async_ssl_p4 ? null, lwt ? null +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild +, ppx_driver, ppx_sexp_conv +, ipaddr, uri, logs +, ocaml_lwt ? null +, async ? null, async_ssl ? null +, tls ? null }: -buildOcaml rec { - name = "conduit"; - version = "0.10.0"; +stdenv.mkDerivation rec { + version = "0.15.4"; + name = "ocaml${ocaml.version}-conduit-${version}"; - src = fetchurl { - url = "https://github.com/mirage/ocaml-conduit/archive/v${version}.tar.gz"; - sha256 = "1jz2skzsyg0axlkk9s6ahfblfrjx599wisyfs0cvn5dik9jqjadh"; - }; + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-conduit"; + rev = "v${version}"; + sha256 = "1ya7jqvhl8hc22cid5myf31w5c473imdxjnl9785lavsqj3djjxq"; + }; - propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr_p4 ]; - buildInputs = stdenv.lib.optional (lwt != null) lwt - ++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4 - ++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4; + buildInputs = [ ocaml findlib ocamlbuild ppx_driver ppx_sexp_conv + ocaml_lwt async async_ssl tls ]; + propagatedBuildInputs = [ ipaddr uri logs ]; - meta = with stdenv.lib; { - homepage = https://github.com/mirage/ocaml-conduit; - description = "Resolve URIs into communication channels for Async or Lwt "; - license = licenses.mit; - maintainers = [ maintainers.ericbmerritt ]; - }; + createFindlibDestdir = true; + + meta = { + description = "Network connection library for TCP and SSL"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + }; } |