public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages: make lwt-3.0.0 the default

Browse Source
This commit is contained in:
Vincent Laporte
2017-07-02 15:22:04 +00:00
parent e4ca35a4f6
commit dbe61c96ae
5 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/ocaml/js_of_ocaml/default.nix
View File

@@ -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 ];