diff options
author | Matthew Maurer <matthew.r.maurer@gmail.com> | 2016-09-13 20:21:56 -0400 |
---|---|---|
committer | Matthew Maurer <matthew.r.maurer@gmail.com> | 2016-09-14 02:35:48 -0400 |
commit | fc4b5786cd185ca255ac41d27dc4bcf292ba6aa7 (patch) | |
tree | be40a0a44a619e395ccf193367f0d0100a187eb9 /pkgs/development/ocaml-modules/conduit | |
parent | 3eb02d9f386576790ba6d8544779aa3b980e972f (diff) | |
download | nixlib-fc4b5786cd185ca255ac41d27dc4bcf292ba6aa7.tar nixlib-fc4b5786cd185ca255ac41d27dc4bcf292ba6aa7.tar.gz nixlib-fc4b5786cd185ca255ac41d27dc4bcf292ba6aa7.tar.bz2 nixlib-fc4b5786cd185ca255ac41d27dc4bcf292ba6aa7.tar.lz nixlib-fc4b5786cd185ca255ac41d27dc4bcf292ba6aa7.tar.xz nixlib-fc4b5786cd185ca255ac41d27dc4bcf292ba6aa7.tar.zst nixlib-fc4b5786cd185ca255ac41d27dc4bcf292ba6aa7.zip |
sexplib: 112.24.01 -> 112.24.01/113.33.03
PPX/P4 split
Diffstat (limited to 'pkgs/development/ocaml-modules/conduit')
-rw-r--r-- | pkgs/development/ocaml-modules/conduit/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index dbb83f4c8cf0..26accd99db67 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, sexplib, stringext, uri, cstruct, ipaddr, +{stdenv, buildOcaml, fetchurl, sexplib_p4, stringext, uri, cstruct, ipaddr, async ? null, async_ssl ? null, lwt ? null}: buildOcaml rec { @@ -10,7 +10,7 @@ buildOcaml rec { sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1"; }; - propagatedBuildInputs = ([ sexplib stringext uri cstruct ipaddr ] + propagatedBuildInputs = ([ sexplib_p4 stringext uri cstruct ipaddr ] ++ stdenv.lib.optional (lwt != null) lwt ++ stdenv.lib.optional (async != null) async ++ stdenv.lib.optional (async_ssl != null) async_ssl); |