public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jbuilder: 1.0.1 -> dune: 1.1.1

Browse Source
This commit is contained in:
Vincent Laporte
2018-09-05 16:11:47 +00:00
committed by Vincent Laporte
parent eb429c7c54
commit fc19401d67
69 changed files with 228 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/ocaml-modules/cohttp/default.nix
View File

@@ -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";

6
pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
View File

@@ -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";
}

6
pkgs/development/ocaml-modules/cohttp/lwt.nix
View File

@@ -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";
}