diff options
| author | sternenseemann <git@lukasepple.de> | 2017-02-18 22:54:02 +0100 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-02-23 08:01:29 +0000 |
| commit | 8352e0b38c65a736219619d8821ad50f787e58d1 (patch) | |
| tree | f07487c56fcc4de043a9a017b05873319c56e1d9 /pkgs/development/ocaml-modules/conduit | |
| parent | 6c37a92b2bdb77465b9486e904b83895b2b45596 (diff) | |
| download | nixpkgs-8352e0b38c65a736219619d8821ad50f787e58d1.tar nixpkgs-8352e0b38c65a736219619d8821ad50f787e58d1.tar.gz nixpkgs-8352e0b38c65a736219619d8821ad50f787e58d1.tar.bz2 nixpkgs-8352e0b38c65a736219619d8821ad50f787e58d1.tar.lz nixpkgs-8352e0b38c65a736219619d8821ad50f787e58d1.tar.xz nixpkgs-8352e0b38c65a736219619d8821ad50f787e58d1.tar.zst nixpkgs-8352e0b38c65a736219619d8821ad50f787e58d1.zip | |
ocaml-ipaddr: 2.6.1 -> 2.7.2
Keeps the legacy version under attribute `ipaddr_p4`; it is needed for OCaml < 4.02 and some libraries (eg `conduit`).
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 22c74d7f92e..d1da95ffaa1 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr +{ 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 }: @@ -12,7 +12,7 @@ buildOcaml rec { sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1"; }; - propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr ]; + 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; |