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

ocamlPackages.cohttp: refactor

Browse Source
This commit is contained in:
Vincent Laporte 2016-11-12 09:55:42 +01:00
parent 24df641deb
commit 72c1a6f0f4
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/ocaml-modules/cohttp/default.nix
View File

@ -1,22 +1,23 @@
{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib_p4, sexplib_p4, conduit,
stringext, base64, magic-mime, ounit, alcotest, lwt ? null,
async ? null, async_ssl ? null}:
{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri, fieldslib_p4
, sexplib_p4, conduit , stringext, base64, magic-mime, ounit, alcotest
, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
, lwt ? null, async_p4 ? null, async_ssl_p4 ? null
}:
buildOcaml rec {
name = "cohttp";
version = "0.19.3";
minimumSupportedOcamlVersion = "4.02";
minimumSupportedOcamlVersion = "4.01";
src = fetchurl {
url = "https://github.com/mirage/ocaml-cohttp/archive/v${version}.tar.gz";
sha256 = "1nrzpd4h52c1hnzcgsz462676saj9zss708ng001h54dglk8i1iv";
};
buildInputs = [ alcotest ];
propagatedBuildInputs = [ cmdliner re uri fieldslib_p4 sexplib_p4 sexplib_p4
conduit stringext base64 magic-mime ounit async
async_ssl lwt ];
buildInputs = [ alcotest cmdliner conduit magic-mime ounit lwt ]
++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ];
propagatedBuildInputs = [ re stringext uri fieldslib_p4 sexplib_p4 base64 ];
buildFlags = "PREFIX=$(out)";

5
pkgs/development/tools/misc/trv/default.nix
View File

@ -1,6 +1,7 @@
{stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4
, re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find
, cohttp, uri, tzdata}:
, cohttp, conduit, magic-mime, uri, tzdata
}:
assert stdenv.lib.versionOlder "4.02" ocaml.version;
@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ ocaml findlib camlp4 ];
buildInputs = [ ocaml findlib camlp4 conduit magic-mime ];
propagatedBuildInputs = [ core_p4 async_p4 async_unix_p4
async_extra_p4 sexplib_p4 async_shell core_extended_p4
async_find cohttp uri re2_p4 ];