diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2018-09-05 16:11:47 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2018-09-15 19:32:32 +0000 |
| commit | fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4 (patch) | |
| tree | 752fb6ac7c0edf9a82887fa6943dc47db2ecdaf1 /pkgs/development/ocaml-modules/conduit | |
| parent | eb429c7c545e4759b170402796a8a4e7d22a0dda (diff) | |
jbuilder: 1.0.1 -> dune: 1.1.1
Diffstat (limited to 'pkgs/development/ocaml-modules/conduit')
| -rw-r--r-- | pkgs/development/ocaml-modules/conduit/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/conduit/lwt-unix.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/conduit/lwt.nix | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 98ac997383c7..fdfd2bed1f15 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder +{ stdenv, fetchFromGitHub, ocaml, findlib, dune , ppx_sexp_conv , astring, ipaddr, uri }: @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { sha256 = "1ryigzh7sfif1mly624fpm87aw5h60n5wzdlrvqsf71qcpxc6iiz"; }; - buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ]; + buildInputs = [ ocaml findlib dune ppx_sexp_conv ]; propagatedBuildInputs = [ astring ipaddr uri ]; - buildPhase = "jbuilder build -p conduit"; + buildPhase = "dune build -p conduit"; - inherit (jbuilder) installPhase; + inherit (dune) 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 index 5f33bbc42c10..b4357979de75 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, jbuilder, conduit-lwt +{ stdenv, ocaml, findlib, dune, conduit-lwt , logs, ppx_sexp_conv, lwt_ssl }: @@ -10,9 +10,9 @@ 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 ]; + buildInputs = [ ocaml findlib dune ppx_sexp_conv ]; propagatedBuildInputs = [ conduit-lwt logs lwt_ssl ]; - buildPhase = "jbuilder build -p conduit-lwt-unix"; + buildPhase = "dune build -p conduit-lwt-unix"; } diff --git a/pkgs/development/ocaml-modules/conduit/lwt.nix b/pkgs/development/ocaml-modules/conduit/lwt.nix index 8ee3d827ecc1..5b085239cfd0 100644 --- a/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, jbuilder, ppx_sexp_conv, conduit, lwt3 }: +{ stdenv, ocaml, findlib, dune, ppx_sexp_conv, conduit, lwt3 }: if !stdenv.lib.versionAtLeast conduit.version "1.0" then conduit @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-conduit-lwt-${version}"; inherit (conduit) version src installPhase meta; - buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ]; + buildInputs = [ ocaml findlib dune ppx_sexp_conv ]; propagatedBuildInputs = [ conduit lwt3 ]; - buildPhase = "jbuilder build -p conduit-lwt"; + buildPhase = "dune build -p conduit-lwt"; } |