diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-05 12:34:05 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-05 12:34:05 +0200 |
| commit | 0be2928ac9f8fa7ad2245785e586381ba8002585 (patch) | |
| tree | c1d9a25219eb2e614c945aeac3e9ea33f74a135b /pkgs/development/ocaml-modules/lwt | |
| parent | 81025f9ef717895b4170bf93b234311d0f8f2386 (diff) | |
| parent | 623df97af5a1bf1f5dcbf9075b0ac8cbba036e25 (diff) | |
| download | nixlib-0be2928ac9f8fa7ad2245785e586381ba8002585.tar nixlib-0be2928ac9f8fa7ad2245785e586381ba8002585.tar.gz nixlib-0be2928ac9f8fa7ad2245785e586381ba8002585.tar.bz2 nixlib-0be2928ac9f8fa7ad2245785e586381ba8002585.tar.lz nixlib-0be2928ac9f8fa7ad2245785e586381ba8002585.tar.xz nixlib-0be2928ac9f8fa7ad2245785e586381ba8002585.tar.zst nixlib-0be2928ac9f8fa7ad2245785e586381ba8002585.zip | |
Merge branch 'master' into staging
Evaluation was blocked on Hydra; this should fix it.
Diffstat (limited to 'pkgs/development/ocaml-modules/lwt')
| -rw-r--r-- | pkgs/development/ocaml-modules/lwt/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 99438cfc20c5..262fef763d89 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,5 +1,5 @@ { stdenv, buildOcaml, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4 -, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib +, react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib , ppx_tools, result, cppo , ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" , version ? if stdenv.lib.versionAtLeast ocaml.version "4.02" then "2.7.1" else "2.6.0" @@ -31,7 +31,7 @@ buildOcaml rec { ++ stdenv.lib.optional ppxSupport ppx_tools; propagatedBuildInputs = [ result ] - ++ optionals [ ocaml_react ocaml_ssl ] + ++ optionals [ react ocaml_ssl ] ++ [ libev ]; configureScript = "ocaml setup.ml -configure"; |