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

Merge branch 'master' into staging

Browse Source 
Evaluation was blocked on Hydra; this should fix it.
This commit is contained in:
Vladimír Čunát
2017-10-05 12:34:05 +02:00
parent 81025f9ef7 623df97af5
commit 0be2928ac9
26 changed files with 637 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/lwt/default.nix
+2 -2
View File
@@ -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";