diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-02-20 18:37:42 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2020-02-28 21:24:26 +0100 |
| commit | fe0ebdf8257bc817f1b76a453d63b40309a0d937 (patch) | |
| tree | 03b4b0318593798625b960a20b31aa24330cd500 | |
| parent | 305dc2a199a8a9571b22d26fc67420c9e5fb8524 (diff) | |
| download | nixpkgs-fe0ebdf8257bc817f1b76a453d63b40309a0d937.tar nixpkgs-fe0ebdf8257bc817f1b76a453d63b40309a0d937.tar.gz nixpkgs-fe0ebdf8257bc817f1b76a453d63b40309a0d937.tar.bz2 nixpkgs-fe0ebdf8257bc817f1b76a453d63b40309a0d937.tar.lz nixpkgs-fe0ebdf8257bc817f1b76a453d63b40309a0d937.tar.xz nixpkgs-fe0ebdf8257bc817f1b76a453d63b40309a0d937.tar.zst nixpkgs-fe0ebdf8257bc817f1b76a453d63b40309a0d937.zip | |
ocamlPackages.conduit_p4: remove at 0.10.0
| -rw-r--r-- | pkgs/development/ocaml-modules/conduit/0.10.0.nix | 26 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 9 |
2 files changed, 1 insertions, 34 deletions
diff --git a/pkgs/development/ocaml-modules/conduit/0.10.0.nix b/pkgs/development/ocaml-modules/conduit/0.10.0.nix deleted file mode 100644 index 4d1c43e0ae1..00000000000 --- a/pkgs/development/ocaml-modules/conduit/0.10.0.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 72d41621c23..47181023539 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -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 { }; |