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-15 19:32:32 +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
pkgs/development/ocaml-modules/conduit/default.nix
+4 -4
View File
@@ -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";
pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+3 -3
View File
@@ -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";
}
pkgs/development/ocaml-modules/conduit/lwt.nix
+3 -3
View File
@@ -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";
}