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/lwt/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchzip, pkgconfig, ncurses, libev, jbuilder
{ stdenv, fetchzip, pkgconfig, ncurses, libev, dune
, ocaml, findlib, cppo
, ocaml-migrate-parsetree, ppx_tools_versioned, result
, withP4 ? true
@@ -19,14 +19,14 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ncurses ocaml findlib jbuilder cppo
buildInputs = [ ncurses ocaml findlib dune cppo
ocaml-migrate-parsetree ppx_tools_versioned ]
++ stdenv.lib.optional withP4 camlp4;
propagatedBuildInputs = [ libev result ];
installPhase = ''
ocaml src/util/install_filter.ml
${jbuilder.installPhase}
${dune.installPhase}
'';
meta = {
pkgs/development/ocaml-modules/lwt/ppx.nix
+4 -4
View File
@@ -1,16 +1,16 @@
{ stdenv, jbuilder, ocaml, findlib, lwt, ppx_tools_versioned }:
{ stdenv, dune, ocaml, findlib, lwt, ppx_tools_versioned }:
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-lwt_ppx-${lwt.version}";
inherit (lwt) src;
buildInputs = [ jbuilder ocaml findlib ppx_tools_versioned ];
buildInputs = [ dune ocaml findlib ppx_tools_versioned ];
propagatedBuildInputs = [ lwt ];
buildPhase = "jbuilder build -p lwt_ppx";
installPhase = "${jbuilder.installPhase} lwt_ppx.install";
buildPhase = "dune build -p lwt_ppx";
installPhase = "${dune.installPhase} lwt_ppx.install";
meta = {
description = "Ppx syntax extension for Lwt";