diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-02 15:22:04 +0000 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-02 15:22:04 +0000 |
| commit | dbe61c96ae778f21cb9111198d68eab3088cd27c (patch) | |
| tree | 60cb1ac2f77a5cf1dbe274d254615ca7375067d5 /pkgs/development/tools/ocaml | |
| parent | e4ca35a4f6a6d0429cc344d163baa7c215596a61 (diff) | |
| download | nixlib-dbe61c96ae778f21cb9111198d68eab3088cd27c.tar nixlib-dbe61c96ae778f21cb9111198d68eab3088cd27c.tar.gz nixlib-dbe61c96ae778f21cb9111198d68eab3088cd27c.tar.bz2 nixlib-dbe61c96ae778f21cb9111198d68eab3088cd27c.tar.lz nixlib-dbe61c96ae778f21cb9111198d68eab3088cd27c.tar.xz nixlib-dbe61c96ae778f21cb9111198d68eab3088cd27c.tar.zst nixlib-dbe61c96ae778f21cb9111198d68eab3088cd27c.zip | |
ocamlPackages: make lwt-3.0.0 the default
Diffstat (limited to 'pkgs/development/tools/ocaml')
| -rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index ab2ef4d9c5e6..23556a0edbde 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocaml_lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild +{ stdenv, fetchurl, ocaml, findlib, lwt, menhir, ocsigen_deriving, ppx_deriving, camlp4, ocamlbuild , cmdliner, tyxml, reactivedata, cppo, which, base64, uchar, yojson }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib menhir ocsigen_deriving ocamlbuild cmdliner reactivedata cppo which base64 ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast ocaml.version "4.02") [ yojson tyxml ]; - propagatedBuildInputs = [ ocaml_lwt camlp4 ppx_deriving ] + propagatedBuildInputs = [ lwt camlp4 ppx_deriving ] ++ stdenv.lib.optional (version == "2.8.4") uchar; patches = [ ./Makefile.conf.diff ]; |