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/cohttp | |
| parent | eb429c7c545e4759b170402796a8a4e7d22a0dda (diff) | |
| download | nixlib-fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4.tar nixlib-fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4.tar.gz nixlib-fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4.tar.bz2 nixlib-fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4.tar.lz nixlib-fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4.tar.xz nixlib-fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4.tar.zst nixlib-fc19401d67b9ffb1cb6a8cc870c5e1d800dc73e4.zip | |
jbuilder: 1.0.1 -> dune: 1.1.1
Diffstat (limited to 'pkgs/development/ocaml-modules/cohttp')
| -rw-r--r-- | pkgs/development/ocaml-modules/cohttp/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/cohttp/lwt-unix.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/cohttp/lwt.nix | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 962525b47e42..79dc919556ae 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder +{ stdenv, fetchFromGitHub, ocaml, findlib, dune , ppx_fields_conv, ppx_sexp_conv, ppx_deriving , base64, fieldslib, jsonm, re, stringext, uri }: @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { sha256 = "0zgn32axmjvkmbvyfkbjcqximzc4zcfxs118b98xyrqnvwb0k7ka"; }; - buildInputs = [ ocaml findlib jbuilder jsonm ppx_fields_conv ppx_sexp_conv ]; + buildInputs = [ ocaml findlib dune jsonm ppx_fields_conv ppx_sexp_conv ]; propagatedBuildInputs = [ ppx_deriving base64 fieldslib re stringext uri ]; - buildPhase = "jbuilder build -p cohttp"; + buildPhase = "dune build -p cohttp"; - inherit (jbuilder) installPhase; + inherit (dune) installPhase; meta = { description = "HTTP(S) library for Lwt, Async and Mirage"; diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index c526a101dd9d..6489a583198c 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, jbuilder, cohttp-lwt +{ stdenv, ocaml, findlib, dune, cohttp-lwt , conduit-lwt-unix, ppx_sexp_conv , cmdliner, fmt, magic-mime }: @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-cohttp-lwt-unix-${version}"; inherit (cohttp-lwt) version src installPhase meta; - buildInputs = [ ocaml findlib jbuilder cmdliner ppx_sexp_conv ]; + buildInputs = [ ocaml findlib dune cmdliner ppx_sexp_conv ]; propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ]; - buildPhase = "jbuilder build -p cohttp-lwt-unix"; + buildPhase = "dune build -p cohttp-lwt-unix"; } diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix index 21bea646d721..1630bfd131e4 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -1,4 +1,4 @@ -{ stdenv, ocaml, findlib, jbuilder, cohttp, lwt3, uri, ppx_sexp_conv }: +{ stdenv, ocaml, findlib, dune, cohttp, lwt3, uri, ppx_sexp_conv }: if !stdenv.lib.versionAtLeast cohttp.version "0.99" then cohttp @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-cohttp-lwt-${version}"; inherit (cohttp) version src installPhase meta; - buildInputs = [ ocaml findlib jbuilder uri ppx_sexp_conv ]; + buildInputs = [ ocaml findlib dune uri ppx_sexp_conv ]; propagatedBuildInputs = [ cohttp lwt3 ]; - buildPhase = "jbuilder build -p cohttp-lwt"; + buildPhase = "dune build -p cohttp-lwt"; } |