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

ocamlPackages.conduit: 0.10.0 -> 0.15.4

Browse Source 
Keeping the old version under attribute conduit_p4.
This commit is contained in:
Vincent Laporte 2017-07-01 10:18:34 +00:00
parent 352d487101
commit fe9147a042
3 changed files with 62 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/ocaml-modules/conduit/0.10.0.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr_p4
, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
, async_p4 ? null, async_ssl_p4 ? null, lwt ? null
}:
buildOcaml rec {
name = "conduit";
version = "0.10.0";
src = fetchurl {
url = "https://github.com/mirage/ocaml-conduit/archive/v${version}.tar.gz";
sha256 = "1jz2skzsyg0axlkk9s6ahfblfrjx599wisyfs0cvn5dik9jqjadh";
};
propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr_p4 ];
buildInputs = stdenv.lib.optional (lwt != null) lwt
++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4
++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4;
meta = with stdenv.lib; {
homepage = https://github.com/mirage/ocaml-conduit;
description = "Resolve URIs into communication channels for Async or Lwt ";
license = licenses.mit;
maintainers = [ maintainers.ericbmerritt ];
};
}

47
pkgs/development/ocaml-modules/conduit/default.nix
View File

@ -1,26 +1,33 @@
{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr_p4 { stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild
, asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02" , ppx_driver, ppx_sexp_conv
, async_p4 ? null, async_ssl_p4 ? null, lwt ? null , ipaddr, uri, logs
, ocaml_lwt ? null
, async ? null, async_ssl ? null
, tls ? null
}: }:
buildOcaml rec { stdenv.mkDerivation rec {
name = "conduit"; version = "0.15.4";
version = "0.10.0"; name = "ocaml${ocaml.version}-conduit-${version}";
src = fetchurl { src = fetchFromGitHub {
url = "https://github.com/mirage/ocaml-conduit/archive/v${version}.tar.gz"; owner = "mirage";
sha256 = "1jz2skzsyg0axlkk9s6ahfblfrjx599wisyfs0cvn5dik9jqjadh"; repo = "ocaml-conduit";
}; rev = "v${version}";
sha256 = "1ya7jqvhl8hc22cid5myf31w5c473imdxjnl9785lavsqj3djjxq";
};
propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr_p4 ]; buildInputs = [ ocaml findlib ocamlbuild ppx_driver ppx_sexp_conv
buildInputs = stdenv.lib.optional (lwt != null) lwt ocaml_lwt async async_ssl tls ];
++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4 propagatedBuildInputs = [ ipaddr uri logs ];
++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4;
meta = with stdenv.lib; { createFindlibDestdir = true;
homepage = https://github.com/mirage/ocaml-conduit;
description = "Resolve URIs into communication channels for Async or Lwt "; meta = {
license = licenses.mit; description = "Network connection library for TCP and SSL";
maintainers = [ maintainers.ericbmerritt ]; license = stdenv.lib.licenses.isc;
}; maintainers = [ stdenv.lib.maintainers.vbgl ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
};
} }

13
pkgs/top-level/ocaml-packages.nix
View File

@ -114,10 +114,6 @@ let
}; };
camlimages = camlimages_4_1; camlimages = camlimages_4_1;
conduit = callPackage ../development/ocaml-modules/conduit {
lwt = ocaml_lwt;
};
biniou = callPackage ../development/ocaml-modules/biniou { }; biniou = callPackage ../development/ocaml-modules/biniou { };
bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { }; bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { };
@ -136,6 +132,15 @@ let
lwt = ocaml_lwt; lwt = ocaml_lwt;
}; };
conduit_p4 = callPackage ../development/ocaml-modules/conduit/0.10.0.nix {
lwt = ocaml_lwt;
};
conduit =
if lib.versionOlder "4.03" ocaml.version
then callPackage ../development/ocaml-modules/conduit { }
else conduit_p4;
config-file = callPackage ../development/ocaml-modules/config-file { }; config-file = callPackage ../development/ocaml-modules/config-file { };
containers = callPackage ../development/ocaml-modules/containers { }; containers = callPackage ../development/ocaml-modules/containers { };