b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ocamlPackages.conduit_p4: remove at 0.10.0

Browse source
This commit is contained in:
Vincent Laporte 2020-02-20 18:37:42 +01:00 committed by Vincent Laporte
parent 305dc2a199
commit fe0ebdf825
2 changed files with 1 additions and 34 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
View file

@ -1,26 +0,0 @@
{ 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 ];
};
}

9
pkgs/top-level/ocaml-packages.nix
View file

@ -160,14 +160,7 @@ let
cohttp-lwt-unix = callPackage ../development/ocaml-modules/cohttp/lwt-unix.nix { };
conduit_p4 = callPackage ../development/ocaml-modules/conduit/0.10.0.nix {
lwt = lwt2;
};
conduit =
if lib.versionOlder "4.03" ocaml.version
then callPackage ../development/ocaml-modules/conduit { }
else conduit_p4;
conduit = callPackage ../development/ocaml-modules/conduit { };
conduit-lwt = callPackage ../development/ocaml-modules/conduit/lwt.nix { };