JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/google-drive-ocamlfuse/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, zlib { stdenv, fetchFromGitHub, zlib
, ocaml, jbuilder, opam, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: , ocaml, dune, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "google-drive-ocamlfuse-${version}"; name = "google-drive-ocamlfuse-${version}";
@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
sha256 = "1rjm2jcc93sz7l25zbgqal81534vvvbmwy7847s0k8fkr5nq97gp"; sha256 = "1rjm2jcc93sz7l25zbgqal81534vvvbmwy7847s0k8fkr5nq97gp";
}; };
nativeBuildInputs = [ jbuilder opam ]; nativeBuildInputs = [ dune ];
buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ]; buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl ];
buildPhase = "jbuilder build @install"; buildPhase = "jbuilder build @install";
installPhase = "mkdir $out && jbuilder install --prefix $out"; installPhase = "mkdir $out && dune install --prefix $out";
meta = { meta = {
homepage = http://gdfuse.forge.ocamlcore.org/; homepage = http://gdfuse.forge.ocamlcore.org/;

6
pkgs/development/compilers/reason/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, jbuilder { stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune
, menhir, merlin_extend, ppx_tools_versioned, utop , menhir, merlin_extend, ppx_tools_versioned, utop
}: }:
@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
buildInputs = [ makeWrapper ocaml findlib jbuilder utop menhir ]; buildInputs = [ makeWrapper ocaml findlib dune utop menhir ];
buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
installPhase = '' installPhase = ''
for p in reason rtop for p in reason rtop
do do
${jbuilder.installPhase} $p.install ${dune.installPhase} $p.install
done done
wrapProgram $out/bin/rtop \ wrapProgram $out/bin/rtop \

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

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, jbuilder { stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, dune
, cmdliner, astring, fmt, result , cmdliner, astring, fmt, result
}: }:
@ -6,9 +6,9 @@ let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02" then { if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
version = "0.8.2"; version = "0.8.2";
sha256 = "1zpg079v89mz2dpnh59f9hk5r03wl26skfn43llrv3kg24abjfpf"; sha256 = "1zpg079v89mz2dpnh59f9hk5r03wl26skfn43llrv3kg24abjfpf";
buildInputs = [ jbuilder ]; buildInputs = [ dune ];
buildPhase = "jbuilder build -p alcotest"; buildPhase = "dune build -p alcotest";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
} else { } else {
version = "0.7.2"; version = "0.7.2";
sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md"; sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md";

10
pkgs/development/ocaml-modules/angstrom/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest, result { stdenv, fetchFromGitHub, ocaml, findlib, dune, alcotest, result
, bigstringaf , bigstringaf
}: }:
@ -17,15 +17,15 @@ stdenv.mkDerivation rec {
sha256 = "0lh6024yf9ds0nh9i93r9m6p5psi8nvrqxl5x7jwl13zb0r9xfpw"; sha256 = "0lh6024yf9ds0nh9i93r9m6p5psi8nvrqxl5x7jwl13zb0r9xfpw";
}; };
buildInputs = [ ocaml findlib jbuilder alcotest ]; buildInputs = [ ocaml findlib dune alcotest ];
propagatedBuildInputs = [ bigstringaf result ]; propagatedBuildInputs = [ bigstringaf result ];
buildPhase = "jbuilder build -p angstrom"; buildPhase = "dune build -p angstrom";
doCheck = true; doCheck = true;
checkPhase = "jbuilder runtest -p angstrom"; checkPhase = "dune runtest -p angstrom";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
homepage = https://github.com/inhabitedtype/angstrom; homepage = https://github.com/inhabitedtype/angstrom;

6
pkgs/development/ocaml-modules/atd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, menhir, easy-format, ocaml, findlib, fetchFromGitHub, jbuilder, which, biniou, yojson }: { stdenv, menhir, easy-format, ocaml, findlib, fetchFromGitHub, dune, which, biniou, yojson }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.0.0"; version = "2.0.0";
@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true; createFindlibDestdir = true;
buildInputs = [ which jbuilder ocaml findlib menhir ]; buildInputs = [ which dune ocaml findlib menhir ];
propagatedBuildInputs = [ easy-format biniou yojson ]; propagatedBuildInputs = [ easy-format biniou yojson ];
buildPhase = "jbuilder build"; buildPhase = "jbuilder build";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/mjambon/atd; homepage = https://github.com/mjambon/atd;

6
pkgs/development/ocaml-modules/bigstringaf/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest }: { stdenv, fetchFromGitHub, ocaml, findlib, dune, alcotest }:
if !stdenv.lib.versionAtLeast ocaml.version "4.03" if !stdenv.lib.versionAtLeast ocaml.version "4.03"
then throw "bigstringaf is not available for OCaml ${ocaml.version}" then throw "bigstringaf is not available for OCaml ${ocaml.version}"
@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
sha256 = "1yx6hv8rk0ldz1h6kk00rwg8abpfc376z00aifl9f5rn7xavpscs"; sha256 = "1yx6hv8rk0ldz1h6kk00rwg8abpfc376z00aifl9f5rn7xavpscs";
}; };
buildInputs = [ ocaml findlib jbuilder alcotest ]; buildInputs = [ ocaml findlib dune alcotest ];
doCheck = true; doCheck = true;
checkPhase = "dune runtest"; checkPhase = "dune runtest";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "Bigstring intrinsics and fast blits based on memcpy/memmove"; description = "Bigstring intrinsics and fast blits based on memcpy/memmove";

6
pkgs/development/ocaml-modules/biniou/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, easy-format }: { stdenv, fetchFromGitHub, ocaml, findlib, dune, easy-format }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2.0"; version = "1.2.0";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb"; sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb";
}; };
buildInputs = [ ocaml findlib jbuilder ]; buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ easy-format ]; propagatedBuildInputs = [ easy-format ];
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
patchShebangs . patchShebangs .
''; '';
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
inherit (src.meta) homepage; inherit (src.meta) homepage;

6
pkgs/development/ocaml-modules/bitstring/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder { stdenv, fetchFromGitHub, ocaml, findlib, dune
, ppx_tools_versioned , ppx_tools_versioned
, ounit , ounit
}: }:
@ -13,14 +13,14 @@ stdenv.mkDerivation rec {
sha256 = "0r49qax7as48jgknzaq6p9rbpmrvnmlic713wzz5bj60j5h0396f"; sha256 = "0r49qax7as48jgknzaq6p9rbpmrvnmlic713wzz5bj60j5h0396f";
}; };
buildInputs = [ ocaml findlib jbuilder ppx_tools_versioned ounit ]; buildInputs = [ ocaml findlib dune ppx_tools_versioned ounit ];
buildPhase = "jbuilder build"; buildPhase = "jbuilder build";
doCheck = true; doCheck = true;
checkPhase = "jbuilder runtest"; checkPhase = "jbuilder runtest";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml"; description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml";

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

@ -1,4 +1,4 @@
{ stdenv, fetchzip, findlib, jbuilder, ocaml, configurator, cppo, lablgtk }: { stdenv, fetchzip, findlib, dune, ocaml, configurator, cppo, lablgtk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "camlimages-${version}"; name = "camlimages-${version}";
version = "5.0.0"; version = "5.0.0";
@ -6,9 +6,9 @@ stdenv.mkDerivation rec {
url = "https://bitbucket.org/camlspotter/camlimages/get/${version}.tar.gz"; url = "https://bitbucket.org/camlspotter/camlimages/get/${version}.tar.gz";
sha256 = "00qvwxkfnhv93yi1iq7vy3p5lxyi9xigxcq464s4ii6bmp32d998"; sha256 = "00qvwxkfnhv93yi1iq7vy3p5lxyi9xigxcq464s4ii6bmp32d998";
}; };
buildInputs = [ findlib jbuilder ocaml configurator cppo lablgtk ]; buildInputs = [ findlib dune ocaml configurator cppo lablgtk ];
buildPhase = "jbuilder build -p camlimages"; buildPhase = "dune build -p camlimages";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = with stdenv.lib; { meta = with stdenv.lib; {
branch = "5.0"; branch = "5.0";

6
pkgs/development/ocaml-modules/camomile/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, cppo }: { stdenv, fetchFromGitHub, ocaml, findlib, dune, cppo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.8.7"; version = "0.8.7";
@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "0rh58nl5jrnx01hf0yqbdcc2ncx107pq29zblchww82ci0x1xwsf"; sha256 = "0rh58nl5jrnx01hf0yqbdcc2ncx107pq29zblchww82ci0x1xwsf";
}; };
buildInputs = [ ocaml findlib jbuilder cppo ]; buildInputs = [ ocaml findlib dune cppo ];
configurePhase = "ocaml configure.ml --share $out/share/camomile"; configurePhase = "ocaml configure.ml --share $out/share/camomile";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;

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 , ppx_fields_conv, ppx_sexp_conv, ppx_deriving
, base64, fieldslib, jsonm, re, stringext, uri , base64, fieldslib, jsonm, re, stringext, uri
}: }:
@ -14,13 +14,13 @@ stdenv.mkDerivation rec {
sha256 = "0zgn32axmjvkmbvyfkbjcqximzc4zcfxs118b98xyrqnvwb0k7ka"; 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 ]; 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 = { meta = {
description = "HTTP(S) library for Lwt, Async and Mirage"; 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 , conduit-lwt-unix, ppx_sexp_conv
, cmdliner, fmt, magic-mime , cmdliner, fmt, magic-mime
}: }:
@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-cohttp-lwt-unix-${version}"; name = "ocaml${ocaml.version}-cohttp-lwt-unix-${version}";
inherit (cohttp-lwt) version src installPhase meta; 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 ]; 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" if !stdenv.lib.versionAtLeast cohttp.version "0.99"
then cohttp then cohttp
@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-cohttp-lwt-${version}"; name = "ocaml${ocaml.version}-cohttp-lwt-${version}";
inherit (cohttp) version src installPhase meta; 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 ]; propagatedBuildInputs = [ cohttp lwt3 ];
buildPhase = "jbuilder build -p cohttp-lwt"; buildPhase = "dune build -p cohttp-lwt";
} }

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder { stdenv, fetchFromGitHub, ocaml, findlib, dune
, ppx_sexp_conv , ppx_sexp_conv
, astring, ipaddr, uri , astring, ipaddr, uri
}: }:
@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
sha256 = "1ryigzh7sfif1mly624fpm87aw5h60n5wzdlrvqsf71qcpxc6iiz"; sha256 = "1ryigzh7sfif1mly624fpm87aw5h60n5wzdlrvqsf71qcpxc6iiz";
}; };
buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ]; buildInputs = [ ocaml findlib dune ppx_sexp_conv ];
propagatedBuildInputs = [ astring ipaddr uri ]; propagatedBuildInputs = [ astring ipaddr uri ];
buildPhase = "jbuilder build -p conduit"; buildPhase = "dune build -p conduit";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "Network connection library for TCP and SSL"; description = "Network connection library for TCP and SSL";

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

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, conduit-lwt { stdenv, ocaml, findlib, dune, conduit-lwt
, logs, ppx_sexp_conv, lwt_ssl , logs, ppx_sexp_conv, lwt_ssl
}: }:
@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-conduit-lwt-unix-${version}"; name = "ocaml${ocaml.version}-conduit-lwt-unix-${version}";
inherit (conduit-lwt) version src installPhase meta; 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 ]; propagatedBuildInputs = [ conduit-lwt logs lwt_ssl ];
buildPhase = "jbuilder build -p conduit-lwt-unix"; buildPhase = "dune build -p conduit-lwt-unix";
} }

6
pkgs/development/ocaml-modules/conduit/lwt.nix
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" if !stdenv.lib.versionAtLeast conduit.version "1.0"
then conduit then conduit
@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-conduit-lwt-${version}"; name = "ocaml${ocaml.version}-conduit-lwt-${version}";
inherit (conduit) version src installPhase meta; inherit (conduit) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ]; buildInputs = [ ocaml findlib dune ppx_sexp_conv ];
propagatedBuildInputs = [ conduit lwt3 ]; propagatedBuildInputs = [ conduit lwt3 ];
buildPhase = "jbuilder build -p conduit-lwt"; buildPhase = "dune build -p conduit-lwt";
} }

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, jbuilder, findlib, sexplib, ocplib-endian }: { stdenv, fetchurl, ocaml, dune, findlib, sexplib, ocplib-endian }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-cstruct-${version}"; name = "ocaml${ocaml.version}-cstruct-${version}";
@ -10,13 +10,13 @@ stdenv.mkDerivation rec {
unpackCmd = "tar -xjf $curSrc"; unpackCmd = "tar -xjf $curSrc";
buildInputs = [ ocaml jbuilder findlib ]; buildInputs = [ ocaml dune findlib ];
propagatedBuildInputs = [ sexplib ocplib-endian ]; propagatedBuildInputs = [ sexplib ocplib-endian ];
buildPhase = "jbuilder build -p cstruct"; buildPhase = "dune build -p cstruct";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "Access C-like structures directly from OCaml"; description = "Access C-like structures directly from OCaml";

2
pkgs/development/ocaml-modules/cstruct/ppx.nix
View File

@ -9,5 +9,5 @@ stdenv.mkDerivation rec {
buildInputs = cstruct.buildInputs ++ [ ppx_tools_versioned ]; buildInputs = cstruct.buildInputs ++ [ ppx_tools_versioned ];
propagatedBuildInputs = [ cstruct ]; propagatedBuildInputs = [ cstruct ];
buildPhase = "jbuilder build -p ppx_cstruct"; buildPhase = "dune build -p ppx_cstruct";
} }

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, jbuilder }: { stdenv, fetchurl, ocaml, findlib, dune }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.1"; version = "2.1";
@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
unpackCmd = "tar -xjf $src"; unpackCmd = "tar -xjf $src";
buildInputs = [ ocaml findlib jbuilder ]; buildInputs = [ ocaml findlib dune ];
buildPhase = "jbuilder build -p csv"; buildPhase = "dune build -p csv";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "A pure OCaml library to read and write CSV files"; description = "A pure OCaml library to read and write CSV files";

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, jbuilder }: { stdenv, fetchurl, ocaml, findlib, dune }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
unpackCmd = "tar xjf $src"; unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib jbuilder ]; buildInputs = [ ocaml findlib dune ];
buildPhase = "jbuilder build -p dtoa"; buildPhase = "dune build -p dtoa";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow";

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

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, jbuilder, jsonm, hex, sexplib }: { stdenv, fetchzip, ocaml, findlib, dune, jsonm, hex, sexplib }:
let version = "0.6.0"; in let version = "0.6.0"; in
@ -10,12 +10,12 @@ stdenv.mkDerivation {
sha256 = "18g64lhai0bz65b9fil12vlgfpwa9b5apj7x6d7n4zzm18qfazvj"; sha256 = "18g64lhai0bz65b9fil12vlgfpwa9b5apj7x6d7n4zzm18qfazvj";
}; };
buildInputs = [ ocaml findlib jbuilder ]; buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ jsonm hex sexplib ]; propagatedBuildInputs = [ jsonm hex sexplib ];
buildPhase = "jbuilder build -p ezjsonm"; buildPhase = "dune build -p ezjsonm";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "An easy interface on top of the Jsonm library"; description = "An easy interface on top of the Jsonm library";

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, alcotest }: { stdenv, fetchFromGitHub, ocaml, findlib, dune, alcotest }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02" if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "faraday is not available for OCaml ${ocaml.version}" then throw "faraday is not available for OCaml ${ocaml.version}"
@ -15,14 +15,14 @@ stdenv.mkDerivation rec {
sha256 = "1kql0il1frsbx6rvwqd7ahi4m14ik6la5an6c2w4x7k00ndm4d7n"; sha256 = "1kql0il1frsbx6rvwqd7ahi4m14ik6la5an6c2w4x7k00ndm4d7n";
}; };
buildInputs = [ ocaml findlib jbuilder alcotest ]; buildInputs = [ ocaml findlib dune alcotest ];
buildPhase = "jbuilder build -p faraday"; buildPhase = "dune build -p faraday";
doCheck = true; doCheck = true;
checkPhase = "jbuilder runtest"; checkPhase = "jbuilder runtest";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "Serialization library built for speed and memory efficiency"; description = "Serialization library built for speed and memory efficiency";

6
pkgs/development/ocaml-modules/gapi-ocaml/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: { stdenv, fetchFromGitHub, ocaml, findlib, dune, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02" if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "gapi-ocaml is not available for OCaml ${ocaml.version}" then throw "gapi-ocaml is not available for OCaml ${ocaml.version}"
@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
rev = "v${version}"; rev = "v${version}";
sha256 = "0qgsy51bhkpfgl5rdnjw4bqs5fbh2w4vwrfbl8y3lh1wrqmnwci4"; sha256 = "0qgsy51bhkpfgl5rdnjw4bqs5fbh2w4vwrfbl8y3lh1wrqmnwci4";
}; };
buildInputs = [ ocaml jbuilder findlib ]; buildInputs = [ ocaml dune findlib ];
propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ];
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "OCaml client for google services"; description = "OCaml client for google services";

10
pkgs/development/ocaml-modules/git-http/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, git, cohttp-lwt { stdenv, ocaml, findlib, dune, git, cohttp-lwt
, alcotest, mtime, nocrypto , alcotest, mtime, nocrypto
}: }:
@ -6,16 +6,16 @@ stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-git-http-${version}"; name = "ocaml${ocaml.version}-git-http-${version}";
inherit (git) version src; inherit (git) version src;
buildInputs = [ ocaml findlib jbuilder alcotest mtime nocrypto ]; buildInputs = [ ocaml findlib dune alcotest mtime nocrypto ];
propagatedBuildInputs = [ git cohttp-lwt ]; propagatedBuildInputs = [ git cohttp-lwt ];
buildPhase = "jbuilder build -p git-http"; buildPhase = "dune build -p git-http";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
doCheck = true; doCheck = true;
checkPhase = "jbuilder runtest -p git-http"; checkPhase = "dune runtest -p git-http";
meta = { meta = {
description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml"; description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml";

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

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, git-http { stdenv, ocaml, findlib, dune, git-http
, cohttp-lwt-unix , cohttp-lwt-unix
, tls, cmdliner, mtime , tls, cmdliner, mtime
}: }:
@ -7,13 +7,13 @@ stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-git-unix-${version}"; name = "ocaml${ocaml.version}-git-unix-${version}";
inherit (git-http) version src; inherit (git-http) version src;
buildInputs = [ ocaml findlib jbuilder cmdliner mtime ]; buildInputs = [ ocaml findlib dune cmdliner mtime ];
propagatedBuildInputs = [ cohttp-lwt-unix git-http tls ]; propagatedBuildInputs = [ cohttp-lwt-unix git-http tls ];
buildPhase = "jbuilder build -p git-unix"; buildPhase = "dune build -p git-unix";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "Unix backend for the Git protocol(s)"; description = "Unix backend for the Git protocol(s)";

10
pkgs/development/ocaml-modules/git/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder { stdenv, fetchFromGitHub, ocaml, findlib, dune
, astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri , astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri
, alcotest, mtime, nocrypto , alcotest, mtime, nocrypto
}: }:
@ -14,16 +14,16 @@ stdenv.mkDerivation rec {
sha256 = "0r1bxpxjjnl9hh8xbabsxl7svzvd19hfy73a2y1m4kljmw64dpfh"; sha256 = "0r1bxpxjjnl9hh8xbabsxl7svzvd19hfy73a2y1m4kljmw64dpfh";
}; };
buildInputs = [ ocaml findlib jbuilder alcotest mtime nocrypto ]; buildInputs = [ ocaml findlib dune alcotest mtime nocrypto ];
propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph uri ]; propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph uri ];
buildPhase = "jbuilder build -p git"; buildPhase = "dune build -p git";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
doCheck = true; doCheck = true;
checkPhase = "jbuilder runtest -p git"; checkPhase = "dune runtest -p git";
meta = { meta = {
description = "Git format and protocol in pure OCaml"; description = "Git format and protocol in pure OCaml";

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, jbuilder, cstruct }: { stdenv, fetchurl, ocaml, findlib, dune, cstruct }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02" if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "hex is not available for OCaml ${ocaml.version}" then throw "hex is not available for OCaml ${ocaml.version}"
@ -16,13 +16,13 @@ stdenv.mkDerivation {
unpackCmd = "tar -xjf $curSrc"; unpackCmd = "tar -xjf $curSrc";
buildInputs = [ ocaml findlib jbuilder ]; buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ cstruct ]; propagatedBuildInputs = [ cstruct ];
buildPhase = "jbuilder build -p hex"; buildPhase = "dune build -p hex";
doCheck = true; doCheck = true;
checkPhase = "jbuilder runtest"; checkPhase = "jbuilder runtest";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "Mininal OCaml library providing hexadecimal converters"; description = "Mininal OCaml library providing hexadecimal converters";

6
pkgs/development/ocaml-modules/httpaf/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder { stdenv, fetchFromGitHub, ocaml, findlib, dune
, angstrom, faraday, alcotest , angstrom, faraday, alcotest
}: }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0i2r004ihj00hd97475y8nhjqjln58xx087zcjl0dfp0n7q80517"; sha256 = "0i2r004ihj00hd97475y8nhjqjln58xx087zcjl0dfp0n7q80517";
}; };
buildInputs = [ ocaml findlib jbuilder alcotest ]; buildInputs = [ ocaml findlib dune alcotest ];
propagatedBuildInputs = [ angstrom faraday ]; propagatedBuildInputs = [ angstrom faraday ];
buildPhase = "dune build -p httpaf"; buildPhase = "dune build -p httpaf";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
checkPhase = "dune runtest -p httpaf"; checkPhase = "dune runtest -p httpaf";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "A high-performance, memory-efficient, and scalable web server for OCaml"; description = "A high-performance, memory-efficient, and scalable web server for OCaml";

6
pkgs/development/ocaml-modules/io-page/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, jbuilder, configurator, cstruct }: { stdenv, fetchzip, ocaml, findlib, dune, configurator, cstruct }:
let version = "2.0.1"; in let version = "2.0.1"; in
@ -10,10 +10,10 @@ stdenv.mkDerivation {
sha256 = "1rw04dwrlx5hah5dkjf7d63iff82j9cifr8ifjis5pdwhgwcff8i"; sha256 = "1rw04dwrlx5hah5dkjf7d63iff82j9cifr8ifjis5pdwhgwcff8i";
}; };
buildInputs = [ ocaml findlib jbuilder configurator ]; buildInputs = [ ocaml findlib dune configurator ];
propagatedBuildInputs = [ cstruct ]; propagatedBuildInputs = [ cstruct ];
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
homepage = https://github.com/mirage/io-page; homepage = https://github.com/mirage/io-page;

6
pkgs/development/ocaml-modules/ipaddr/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, ocaml, ocamlbuild, findlib { stdenv, fetchurl, ocaml, ocamlbuild, findlib
, jbuilder, sexplib, ppx_sexp_conv , dune, sexplib, ppx_sexp_conv
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "1amb1pbm9ybpxy6190qygpj6nmbzzs2r6vx4xh5r6v89szx9rfxw"; sha256 = "1amb1pbm9ybpxy6190qygpj6nmbzzs2r6vx4xh5r6v89szx9rfxw";
}; };
buildInputs = [ ocaml findlib ocamlbuild jbuilder ]; buildInputs = [ ocaml findlib ocamlbuild dune ];
propagatedBuildInputs = [ ppx_sexp_conv sexplib ]; propagatedBuildInputs = [ ppx_sexp_conv sexplib ];
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/mirage/ocaml-ipaddr; homepage = https://github.com/mirage/ocaml-ipaddr;

6
pkgs/development/ocaml-modules/janestreet/janePackage.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, jbuilder, findlib, defaultVersion ? "0.11.0" }: { stdenv, fetchFromGitHub, ocaml, dune, findlib, defaultVersion ? "0.11.0" }:
{ name, version ? defaultVersion, buildInputs ? [], hash, meta, ...}@args: { name, version ? defaultVersion, buildInputs ? [], hash, meta, ...}@args:
@ -16,9 +16,9 @@ stdenv.mkDerivation (args // {
sha256 = hash; sha256 = hash;
}; };
buildInputs = [ ocaml jbuilder findlib ] ++ buildInputs; buildInputs = [ ocaml dune findlib ] ++ buildInputs;
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libev, ocaml, findlib, jbuilder { stdenv, fetchurl, libev, ocaml, findlib, dune
, zed, lwt_log, lwt_react , zed, lwt_log, lwt_react
}: }:
@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
sha256 = "1hy5ryagqclgdm9lzh1qil5mrynlypv7mn6qm858hdcnmz9zzn0l"; sha256 = "1hy5ryagqclgdm9lzh1qil5mrynlypv7mn6qm858hdcnmz9zzn0l";
}; };
buildInputs = [ libev ocaml findlib jbuilder ]; buildInputs = [ libev ocaml findlib dune ];
propagatedBuildInputs = [ zed lwt_log lwt_react ]; propagatedBuildInputs = [ zed lwt_log lwt_react ];
buildPhase = "jbuilder build -p lambda-term"; buildPhase = "dune build -p lambda-term";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
hasSharedObjects = true; hasSharedObjects = true;

6
pkgs/development/ocaml-modules/linenoise/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, jbuilder, findlib, result }: { stdenv, fetchFromGitHub, ocaml, dune, findlib, result }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02" if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "linenoise is not available for OCaml ${ocaml.version}" then throw "linenoise is not available for OCaml ${ocaml.version}"
@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
sha256 = "1h6rqfgmhmd7p5z8yhk6zkbrk4yzw1v2fgwas2b7g3hqs6y0xj0q"; sha256 = "1h6rqfgmhmd7p5z8yhk6zkbrk4yzw1v2fgwas2b7g3hqs6y0xj0q";
}; };
buildInputs = [ ocaml findlib jbuilder ]; buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "OCaml bindings to linenoise"; description = "OCaml bindings to linenoise";

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

@ -1,4 +1,4 @@
{ stdenv, fetchzip, pkgconfig, ncurses, libev, jbuilder { stdenv, fetchzip, pkgconfig, ncurses, libev, dune
, ocaml, findlib, cppo , ocaml, findlib, cppo
, ocaml-migrate-parsetree, ppx_tools_versioned, result , ocaml-migrate-parsetree, ppx_tools_versioned, result
, withP4 ? true , withP4 ? true
@ -19,14 +19,14 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ncurses ocaml findlib jbuilder cppo buildInputs = [ ncurses ocaml findlib dune cppo
ocaml-migrate-parsetree ppx_tools_versioned ] ocaml-migrate-parsetree ppx_tools_versioned ]
++ stdenv.lib.optional withP4 camlp4; ++ stdenv.lib.optional withP4 camlp4;
propagatedBuildInputs = [ libev result ]; propagatedBuildInputs = [ libev result ];
installPhase = '' installPhase = ''
ocaml src/util/install_filter.ml ocaml src/util/install_filter.ml
${jbuilder.installPhase} ${dune.installPhase}
''; '';
meta = { meta = {

8
pkgs/development/ocaml-modules/lwt/ppx.nix
View File

@ -1,16 +1,16 @@
{ stdenv, jbuilder, ocaml, findlib, lwt, ppx_tools_versioned }: { stdenv, dune, ocaml, findlib, lwt, ppx_tools_versioned }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml${ocaml.version}-lwt_ppx-${lwt.version}"; name = "ocaml${ocaml.version}-lwt_ppx-${lwt.version}";
inherit (lwt) src; inherit (lwt) src;
buildInputs = [ jbuilder ocaml findlib ppx_tools_versioned ]; buildInputs = [ dune ocaml findlib ppx_tools_versioned ];
propagatedBuildInputs = [ lwt ]; propagatedBuildInputs = [ lwt ];
buildPhase = "jbuilder build -p lwt_ppx"; buildPhase = "dune build -p lwt_ppx";
installPhase = "${jbuilder.installPhase} lwt_ppx.install"; installPhase = "${dune.installPhase} lwt_ppx.install";
meta = { meta = {
description = "Ppx syntax extension for Lwt"; description = "Ppx syntax extension for Lwt";

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

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, lwt }: { stdenv, ocaml, findlib, dune, lwt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.0"; version = "1.0.0";
@ -6,13 +6,13 @@ stdenv.mkDerivation rec {
inherit (lwt) src; inherit (lwt) src;
buildInputs = [ ocaml findlib jbuilder ]; buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ lwt ]; propagatedBuildInputs = [ lwt ];
buildPhase = "jbuilder build -p lwt_log"; buildPhase = "dune build -p lwt_log";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "Lwt logging library (deprecated)"; description = "Lwt logging library (deprecated)";

6
pkgs/development/ocaml-modules/lwt_ssl/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, jbuilder, ssl, lwt }: { stdenv, fetchzip, ocaml, findlib, dune, ssl, lwt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1.2"; version = "1.1.2";
@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "1q0an3djqjxv83v3iswi7m81braqx93kcrcwrxwmf6jzhdm4pn15"; sha256 = "1q0an3djqjxv83v3iswi7m81braqx93kcrcwrxwmf6jzhdm4pn15";
}; };
buildInputs = [ ocaml findlib jbuilder ]; buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ ssl lwt ]; propagatedBuildInputs = [ ssl lwt ];
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
homepage = "https://github.com/aantron/lwt_ssl"; homepage = "https://github.com/aantron/lwt_ssl";

6
pkgs/development/ocaml-modules/mstruct/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder { stdenv, fetchFromGitHub, ocaml, findlib, dune
, cstruct , cstruct
}: }:
@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
sha256 = "1p4ygwzs3n1fj4apfib0z0sabpph21bkq1dgjk4bsa59pq4prncm"; sha256 = "1p4ygwzs3n1fj4apfib0z0sabpph21bkq1dgjk4bsa59pq4prncm";
}; };
buildInputs = [ ocaml findlib jbuilder ]; buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ cstruct ]; propagatedBuildInputs = [ cstruct ];
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "A thin mutable layer on top of cstruct"; description = "A thin mutable layer on top of cstruct";

6
pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, jbuilder, result }: { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune, result }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02" if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "ocaml-migrate-parsetree is not available for OCaml ${ocaml.version}" then throw "ocaml-migrate-parsetree is not available for OCaml ${ocaml.version}"
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
sha256 = "05kbgs9n1x64fk6g3wbjnwjd17w10k3k8dzglnc45xg4hr7z651n"; sha256 = "05kbgs9n1x64fk6g3wbjnwjd17w10k3k8dzglnc45xg4hr7z651n";
}; };
buildInputs = [ ocaml findlib ocamlbuild jbuilder ]; buildInputs = [ ocaml findlib ocamlbuild dune ];
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "Convert OCaml parsetrees between different major versions"; description = "Convert OCaml parsetrees between different major versions";

6
pkgs/development/ocaml-modules/ppx_blob/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, jbuilder, alcotest { stdenv, fetchurl, ocaml, findlib, dune, alcotest
, ocaml-migrate-parsetree , ocaml-migrate-parsetree
}: }:
@ -13,14 +13,14 @@ stdenv.mkDerivation rec {
unpackCmd = "tar xjf $curSrc"; unpackCmd = "tar xjf $curSrc";
buildInputs = [ ocaml findlib jbuilder alcotest ocaml-migrate-parsetree ]; buildInputs = [ ocaml findlib dune alcotest ocaml-migrate-parsetree ];
buildPhase = "dune build -p ppx_blob"; buildPhase = "dune build -p ppx_blob";
doCheck = true; doCheck = true;
checkPhase = "dune runtest -p ppx_blob"; checkPhase = "dune runtest -p ppx_blob";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/johnwhitington/ppx_blob; homepage = https://github.com/johnwhitington/ppx_blob;

6
pkgs/development/ocaml-modules/ppx_derivers/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder }: { stdenv, fetchFromGitHub, ocaml, findlib, dune }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02" if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "ppx_derivers is not available for OCaml ${ocaml.version}" then throw "ppx_derivers is not available for OCaml ${ocaml.version}"
@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
sha256 = "0bnhihl1w31as5w2czly1v3d6pbir9inmgsjg2cj6aaj9v1dzd85"; sha256 = "0bnhihl1w31as5w2czly1v3d6pbir9inmgsjg2cj6aaj9v1dzd85";
}; };
buildInputs = [ ocaml findlib jbuilder ]; buildInputs = [ ocaml findlib dune ];
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "Shared [@@deriving] plugin registry"; description = "Shared [@@deriving] plugin registry";

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, jbuilder, ocaml-migrate-parsetree }: { stdenv, fetchurl, ocaml, findlib, dune, ocaml-migrate-parsetree }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
unpackCmd = "tar xjf $src"; unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ]; buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ];
buildPhase = "jbuilder build -p ppx_gen_rec"; buildPhase = "dune build -p ppx_gen_rec";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/flowtype/ocaml-ppx_gen_rec; homepage = https://github.com/flowtype/ocaml-ppx_gen_rec;

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder { stdenv, fetchFromGitHub, ocaml, findlib, dune
, ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
}: }:
@ -13,15 +13,15 @@ stdenv.mkDerivation rec {
sha256 = "0csp49jh7zgjnqh46mxbf322whlbmgy7v1a12nvxh97qg6i5fvsy"; sha256 = "0csp49jh7zgjnqh46mxbf322whlbmgy7v1a12nvxh97qg6i5fvsy";
}; };
buildInputs = [ ocaml findlib jbuilder ]; buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ propagatedBuildInputs = [
ocaml-compiler-libs ocaml-migrate-parsetree ppx_derivers stdio ocaml-compiler-libs ocaml-migrate-parsetree ppx_derivers stdio
]; ];
buildPhase = "jbuilder build"; buildPhase = "dune build";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "Comprehensive ppx tool set"; description = "Comprehensive ppx tool set";

6
pkgs/development/ocaml-modules/re/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, jbuilder, ounit, seq }: { stdenv, fetchzip, ocaml, findlib, dune, ounit, seq }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02" if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "re is not available for OCaml ${ocaml.version}" then throw "re is not available for OCaml ${ocaml.version}"
@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
sha256 = "0ch6hvmm4ym3w2vghjxf3ka5j1023a37980fqi4zcb7sx756z20i"; sha256 = "0ch6hvmm4ym3w2vghjxf3ka5j1023a37980fqi4zcb7sx756z20i";
}; };
buildInputs = [ ocaml findlib jbuilder ounit ]; buildInputs = [ ocaml findlib dune ounit ];
propagatedBuildInputs = [ seq ]; propagatedBuildInputs = [ seq ];
doCheck = true; doCheck = true;
checkPhase = "jbuilder runtest"; checkPhase = "jbuilder runtest";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
homepage = https://github.com/ocaml/ocaml-re; homepage = https://github.com/ocaml/ocaml-re;

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, jbuilder, benchmark }: { stdenv, fetchurl, ocaml, findlib, ocamlbuild, dune, benchmark }:
let param = let param =
if stdenv.lib.versionAtLeast ocaml.version "4.03" if stdenv.lib.versionAtLeast ocaml.version "4.03"
@ -6,11 +6,11 @@ let param =
version = "0.6"; version = "0.6";
url = " https://github.com/Chris00/ocaml-rope/releases/download/0.6/rope-0.6.tbz"; url = " https://github.com/Chris00/ocaml-rope/releases/download/0.6/rope-0.6.tbz";
sha256 = "06pkbnkad2ck50jn59ggwv154yd9vb01abblihvam6p27m4za1pc"; sha256 = "06pkbnkad2ck50jn59ggwv154yd9vb01abblihvam6p27m4za1pc";
buildInputs = [ jbuilder ]; buildInputs = [ dune ];
extra = { extra = {
unpackCmd = "tar -xjf $curSrc"; unpackCmd = "tar -xjf $curSrc";
buildPhase = "jbuilder build -p rope"; buildPhase = "dune build -p rope";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
}; };
} else { } else {
version = "0.5"; version = "0.5";

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, qtest, result }: { stdenv, fetchFromGitHub, ocaml, findlib, dune, qtest, result }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02" if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "sequence is not available for OCaml ${ocaml.version}" then throw "sequence is not available for OCaml ${ocaml.version}"
@ -16,13 +16,13 @@ stdenv.mkDerivation {
sha256 = "08j37nldw47syq3yw4mzhhvya43knl0d7biddp0q9hwbaxhzgi44"; sha256 = "08j37nldw47syq3yw4mzhhvya43knl0d7biddp0q9hwbaxhzgi44";
}; };
buildInputs = [ ocaml findlib jbuilder qtest ]; buildInputs = [ ocaml findlib dune qtest ];
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];
doCheck = true; doCheck = true;
checkPhase = "jbuilder runtest"; checkPhase = "dune runtest";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
homepage = https://github.com/c-cube/sequence; homepage = https://github.com/c-cube/sequence;

6
pkgs/development/ocaml-modules/sqlexpr/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, jbuilder, ocaml_lwt { stdenv, fetchurl, ocaml, findlib, dune, ocaml_lwt
, lwt_ppx, ocaml-migrate-parsetree, ppx_tools_versioned, csv, ocaml_sqlite3 , lwt_ppx, ocaml-migrate-parsetree, ppx_tools_versioned, csv, ocaml_sqlite3
}: }:
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0z0bkzi1mh0m39alzr2ds7hjpfxffx6azpfsj2wpaxrg64ks8ypd"; sha256 = "0z0bkzi1mh0m39alzr2ds7hjpfxffx6azpfsj2wpaxrg64ks8ypd";
}; };
buildInputs = [ ocaml findlib jbuilder lwt_ppx ocaml-migrate-parsetree ppx_tools_versioned ]; buildInputs = [ ocaml findlib dune lwt_ppx ocaml-migrate-parsetree ppx_tools_versioned ];
propagatedBuildInputs = [ ocaml_lwt csv ocaml_sqlite3 ]; propagatedBuildInputs = [ ocaml_lwt csv ocaml_sqlite3 ];
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
checkPhase = "dune runtest -p sqlexpr"; checkPhase = "dune runtest -p sqlexpr";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "Type-safe, convenient SQLite database access"; description = "Type-safe, convenient SQLite database access";

4
pkgs/development/ocaml-modules/sqlexpr/ppx.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, sqlexpr, ounit { stdenv, ocaml, findlib, dune, sqlexpr, ounit
, ppx_core, ppx_tools_versioned, re, lwt_ppx , ppx_core, ppx_tools_versioned, re, lwt_ppx
}: }:
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ppx_sqlexpr-${version}"; name = "ocaml${ocaml.version}-ppx_sqlexpr-${version}";
inherit (sqlexpr) version src installPhase meta; inherit (sqlexpr) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder sqlexpr ounit ppx_core ppx_tools_versioned re lwt_ppx ]; buildInputs = [ ocaml findlib dune sqlexpr ounit ppx_core ppx_tools_versioned re lwt_ppx ];
buildPhase = "dune build -p ppx_sqlexpr"; buildPhase = "dune build -p ppx_sqlexpr";

6
pkgs/development/ocaml-modules/uri/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, jbuilder, ppx_sexp_conv, ounit { stdenv, fetchurl, ocaml, findlib, dune, ppx_sexp_conv, ounit
, re, sexplib, stringext , re, sexplib, stringext
}: }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
unpackCmd = "tar -xjf $curSrc"; unpackCmd = "tar -xjf $curSrc";
buildInputs = [ ocaml findlib jbuilder ounit ]; buildInputs = [ ocaml findlib dune ounit ];
propagatedBuildInputs = [ ppx_sexp_conv re sexplib stringext ]; propagatedBuildInputs = [ ppx_sexp_conv re sexplib stringext ];
buildPhase = "jbuilder build"; buildPhase = "jbuilder build";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
checkPhase = "jbuilder runtest"; checkPhase = "jbuilder runtest";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
homepage = "https://github.com/mirage/ocaml-uri"; homepage = "https://github.com/mirage/ocaml-uri";

10
pkgs/development/ocaml-modules/wtf8/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, jbuilder }: { stdenv, fetchurl, ocaml, findlib, dune }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
@ -14,13 +14,11 @@ stdenv.mkDerivation rec {
unpackCmd = "tar xjf $src"; unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib jbuilder ]; buildInputs = [ ocaml findlib dune ];
buildPhase = "jbuilder build -p wtf8"; buildPhase = "dune build -p wtf8";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
createFindLibDestdir = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/flowtype/ocaml-wtf8; homepage = https://github.com/flowtype/ocaml-wtf8;

6
pkgs/development/ocaml-modules/yojson/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchzip, ocaml, findlib, jbuilder, cppo, easy-format, biniou }: { stdenv, fetchzip, ocaml, findlib, dune, cppo, easy-format, biniou }:
let let
pname = "yojson"; pname = "yojson";
param = param =
if stdenv.lib.versionAtLeast ocaml.version "4.02" then { if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
version = "1.4.1"; version = "1.4.1";
sha256 = "0nwsfkmqpyfab4rxq76q8ff7giyanghw08094jyrp275v99zdjr9"; sha256 = "0nwsfkmqpyfab4rxq76q8ff7giyanghw08094jyrp275v99zdjr9";
buildInputs = [ jbuilder ]; buildInputs = [ dune ];
extra = { inherit (jbuilder) installPhase; }; extra = { inherit (dune) installPhase; };
} else { } else {
version = "1.2.3"; version = "1.2.3";
sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl"; sha256 = "10dvkndgwanvw4agbjln7kgb1n9s6lii7jw82kwxczl5rd1sgmvl";

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

@ -1,14 +1,14 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, jbuilder }: { stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, react, dune }:
let param = let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02" then if stdenv.lib.versionAtLeast ocaml.version "4.02" then
{ {
version = "1.6"; version = "1.6";
sha256 = "00hhxcjf3bj3w2qm8nzs9x6vrqkadf4i0277s5whzy2rmiknj63v"; sha256 = "00hhxcjf3bj3w2qm8nzs9x6vrqkadf4i0277s5whzy2rmiknj63v";
buildInputs = [ jbuilder ]; buildInputs = [ dune ];
extra = { extra = {
buildPhase = "jbuilder build -p zed"; buildPhase = "dune build -p zed";
inherit (jbuilder) installPhase; }; inherit (dune) installPhase; };
} else { } else {
version = "1.4"; version = "1.4";
sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w";

6
pkgs/development/tools/ocaml/cppo/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, jbuilder }: { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }:
let let
pname = "cppo"; pname = "cppo";
webpage = "http://mjambon.com/${pname}.html"; webpage = "http://mjambon.com/${pname}.html";
@ -9,9 +9,9 @@ let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02" then { if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
version = "1.6.4"; version = "1.6.4";
sha256 = "16mlwck0wngr5pmlr8dxc471zzhhcja3mv4xf4n8jm9nhb3iikvh"; sha256 = "16mlwck0wngr5pmlr8dxc471zzhhcja3mv4xf4n8jm9nhb3iikvh";
buildInputs = [ jbuilder ]; buildInputs = [ dune ];
extra = { extra = {
inherit (jbuilder) installPhase; inherit (dune) installPhase;
}; };
} else { } else {
version = "1.5.0"; version = "1.5.0";

8
pkgs/development/tools/ocaml/jbuilder/default.nix → pkgs/development/tools/ocaml/dune/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, ocamlPackages, opaline }: { stdenv, fetchFromGitHub, ocamlPackages, opaline }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jbuilder-${version}"; name = "dune-${version}";
version = "1.0.1"; version = "1.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ocaml"; owner = "ocaml";
repo = "dune"; repo = "dune";
rev = "${version}"; rev = "${version}";
sha256 = "0k6r9qrbwlnb4rqwqys5fr7khwza7n7d8wpgl9jbb3xpag2zl3q9"; sha256 = "0v2pnxpmqsvrvidpwxvbsypzhqfdnjs5crjp9y61qi8nyj8d75zw";
}; };
buildInputs = with ocamlPackages; [ ocaml findlib ]; buildInputs = with ocamlPackages; [ ocaml findlib ];
@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
preFixup = "rm -rf $out/jbuilder";
meta = { meta = {
inherit (src.meta) homepage; inherit (src.meta) homepage;
description = "Fast, portable and opinionated build system"; description = "Fast, portable and opinionated build system";

6
pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler { stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned, uchar , ocaml-migrate-parsetree, ppx_tools_versioned, uchar
}: }:
@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned ]; buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned ];
postPatch = "patchShebangs lib/generate_stubs.sh"; postPatch = "patchShebangs lib/generate_stubs.sh";
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ]; propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
buildPhase = "jbuilder build -p js_of_ocaml"; buildPhase = "dune build -p js_of_ocaml";
} }

6
pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler { stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, camlp4, ocsigen_deriving , camlp4, ocsigen_deriving
}: }:
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder camlp4 ocsigen_deriving ]; buildInputs = [ ocaml findlib dune camlp4 ocsigen_deriving ];
buildPhase = "jbuilder build -p js_of_ocaml-camlp4"; buildPhase = "dune build -p js_of_ocaml-camlp4";
} }

8
pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder { stdenv, fetchFromGitHub, ocaml, findlib, dune
, cmdliner, cppo, yojson , cmdliner, cppo, yojson
}: }:
@ -17,13 +17,13 @@ stdenv.mkDerivation rec {
sha256 = "0dxxdxgrbg9xvvi3i627krnk6rb1ja0ypp2diwdkpnmy45wak9lv"; sha256 = "0dxxdxgrbg9xvvi3i627krnk6rb1ja0ypp2diwdkpnmy45wak9lv";
}; };
buildInputs = [ ocaml findlib jbuilder cmdliner cppo ]; buildInputs = [ ocaml findlib dune cmdliner cppo ];
propagatedBuildInputs = [ yojson ]; propagatedBuildInputs = [ yojson ];
buildPhase = "jbuilder build -p js_of_ocaml-compiler"; buildPhase = "dune build -p js_of_ocaml-compiler";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
description = "Compiler from OCaml bytecode to Javascript"; description = "Compiler from OCaml bytecode to Javascript";

6
pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler, js_of_ocaml-ppx { stdenv, ocaml, findlib, dune, js_of_ocaml-compiler, js_of_ocaml-ppx
, ocaml-migrate-parsetree, ppx_tools_versioned , ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml, ocaml_lwt, lwt_log , js_of_ocaml, ocaml_lwt, lwt_log
}: }:
@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ]; propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
buildPhase = "jbuilder build -p js_of_ocaml-lwt"; buildPhase = "dune build -p js_of_ocaml-lwt";
} }

6
pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler { stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, ocamlbuild , ocamlbuild
}: }:
@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ]; buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ ocamlbuild ]; propagatedBuildInputs = [ ocamlbuild ];
buildPhase = "jbuilder build -p js_of_ocaml-ocamlbuild"; buildPhase = "dune build -p js_of_ocaml-ocamlbuild";
} }

6
pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler { stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned , ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml , js_of_ocaml
}: }:
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ]; buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
buildPhase = "jbuilder build -p js_of_ocaml-ppx"; buildPhase = "dune build -p js_of_ocaml-ppx";
} }

6
pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler { stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, js_of_ocaml, ppx_deriving , js_of_ocaml, ppx_deriving
}: }:
@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ]; buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ js_of_ocaml ppx_deriving ]; propagatedBuildInputs = [ js_of_ocaml ppx_deriving ];
buildPhase = "jbuilder build -p js_of_ocaml-ppx_deriving_json"; buildPhase = "dune build -p js_of_ocaml-ppx_deriving_json";
} }

6
pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler { stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned , js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml, reactivedata, tyxml , js_of_ocaml, reactivedata, tyxml
}: }:
@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ]; propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];
buildPhase = "jbuilder build -p js_of_ocaml-tyxml"; buildPhase = "dune build -p js_of_ocaml-tyxml";
} }

7
pkgs/development/tools/ocaml/ocaml-top/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchzip, ncurses { stdenv, fetchzip, ncurses
, ocamlPackages , ocamlPackages
, jbuilder }: , dune
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1.5"; version = "1.1.5";
@ -10,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1d4i6aanrafgrgk4mh154k6lkwk0b6mh66rykz33awlf5pfqd8yv"; sha256 = "1d4i6aanrafgrgk4mh154k6lkwk0b6mh66rykz33awlf5pfqd8yv";
}; };
buildInputs = [ ncurses jbuilder ] buildInputs = [ ncurses dune ]
++ (with ocamlPackages; [ ocaml ocp-build findlib lablgtk ocp-index ]); ++ (with ocamlPackages; [ ocaml ocp-build findlib lablgtk ocp-index ]);
configurePhase = '' configurePhase = ''
@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
buildPhase = "jbuilder build"; buildPhase = "jbuilder build";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
homepage = https://www.typerex.org/ocaml-top.html; homepage = https://www.typerex.org/ocaml-top.html;

4
pkgs/development/tools/ocaml/ocp-indent/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, jbuilder, ocp-build, cmdliner }: { stdenv, fetchzip, ocaml, findlib, dune, ocp-build, cmdliner }:
let inherit (stdenv.lib) getVersion versionAtLeast; in let inherit (stdenv.lib) getVersion versionAtLeast; in
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ ocp-build ]; nativeBuildInputs = [ ocp-build ];
buildInputs = [ ocaml findlib cmdliner ]; buildInputs = [ ocaml findlib cmdliner ];
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://typerex.ocamlpro.com/ocp-indent.html; homepage = http://typerex.ocamlpro.com/ocp-indent.html;

8
pkgs/development/tools/ocaml/ocp-index/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocp-build, ocp-indent, cmdliner, re }: { stdenv, fetchFromGitHub, ocaml, findlib, dune, ocp-build, ocp-indent, cmdliner, re }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
sha256 = "0p367aphz9w71qbm3y47qwhgqmyai28l96i1ifb6kg7awph5qmj3"; sha256 = "0p367aphz9w71qbm3y47qwhgqmyai28l96i1ifb6kg7awph5qmj3";
}; };
buildInputs = [ ocaml findlib jbuilder ocp-build cmdliner re ]; buildInputs = [ ocaml findlib dune ocp-build cmdliner re ];
propagatedBuildInputs = [ ocp-indent ]; propagatedBuildInputs = [ ocp-indent ];
buildPhase = "jbuilder build -p ocp-index"; buildPhase = "dune build -p ocp-index";
inherit (jbuilder) installPhase; inherit (dune) installPhase;
meta = { meta = {
homepage = http://typerex.ocamlpro.com/ocp-index.html; homepage = http://typerex.ocamlpro.com/ocp-index.html;

6
pkgs/development/tools/ocaml/utop/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, jbuilder { stdenv, fetchurl, ocaml, findlib, ocamlbuild, dune
, lambdaTerm, cppo, makeWrapper , lambdaTerm, cppo, makeWrapper
}: }:
@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ocaml findlib ocamlbuild cppo jbuilder ]; buildInputs = [ ocaml findlib ocamlbuild cppo dune ];
propagatedBuildInputs = [ lambdaTerm ]; propagatedBuildInputs = [ lambdaTerm ];
inherit (jbuilder) installPhase; inherit (dune) installPhase;
postFixup = postFixup =
let let

4
pkgs/development/tools/pyre/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript { stdenv, fetchFromGitHub, ocamlPackages, makeWrapper, writeScript
, jbuilder, python3, rsync, fetchpatch }: , dune, python3, rsync, fetchpatch }:
let let
# Manually set version - the setup script requires # Manually set version - the setup script requires
# hg and git + keeping the .git directory around. # hg and git + keeping the .git directory around.
@ -39,7 +39,7 @@ let
ppx_deriving_yojson ppx_deriving_yojson
ocamlbuild ocamlbuild
ppxlib ppxlib
jbuilder dune
ounit ounit
# python36Packages.python36Full # TODO # python36Packages.python36Full # TODO
]; ];

1
pkgs/top-level/aliases.nix
View File

@ -131,6 +131,7 @@ mapAliases ({
iana_etc = iana-etc; # added 2017-03-08 iana_etc = iana-etc; # added 2017-03-08
idea = jetbrains; # added 2017-04-03 idea = jetbrains; # added 2017-04-03
inotifyTools = inotify-tools; inotifyTools = inotify-tools;
jbuilder = dune; # added 2018-09-09
joseki = apache-jena-fuseki; # added 2016-02-28 joseki = apache-jena-fuseki; # added 2016-02-28
json_glib = json-glib; # added 2018-02-25 json_glib = json-glib; # added 2018-02-25
kdiff3-qt5 = kdiff3; # added 2017-02-18 kdiff3-qt5 = kdiff3; # added 2017-02-18

4
pkgs/top-level/all-packages.nix
View File

@ -1243,6 +1243,8 @@ with pkgs;
dtrx = callPackage ../tools/compression/dtrx { }; dtrx = callPackage ../tools/compression/dtrx { };
dune = callPackage ../development/tools/ocaml/dune { };
duperemove = callPackage ../tools/filesystems/duperemove { }; duperemove = callPackage ../tools/filesystems/duperemove { };
dylibbundler = callPackage ../tools/misc/dylibbundler { }; dylibbundler = callPackage ../tools/misc/dylibbundler { };
@ -1403,8 +1405,6 @@ with pkgs;
interlock = callPackage ../servers/interlock {}; interlock = callPackage ../servers/interlock {};
jbuilder = callPackage ../development/tools/ocaml/jbuilder { };
kapacitor = callPackage ../servers/monitoring/kapacitor { }; kapacitor = callPackage ../servers/monitoring/kapacitor { };
kisslicer = callPackage ../tools/misc/kisslicer { }; kisslicer = callPackage ../tools/misc/kisslicer { };