diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix index dcd6c433d77d..0c3109106c3d 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix @@ -4,15 +4,17 @@ buildDunePackage rec { pname = "happy-eyeballs"; - version = "0.1.3"; + version = "0.3.0"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz"; - sha256 = "sha256:0ns1bxcmx0rkq4am6vl2aargdzkfhria8sfmgnh8dgzvvj93cc1c"; + sha256 = "17mnid1gvq1ml1zmqzn0m6jmrqw4kqdrjqrdsrphl5kxxyhs03m6"; }; + strictDeps = true; + propagatedBuildInputs = [ domain-name duration @@ -25,6 +27,6 @@ buildDunePackage rec { description = "Connecting to a remote host via IP version 4 or 6"; homepage = "https://github.com/roburio/happy-eyeballs"; license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; + maintainers = with lib.maintainers; [ vbgl ulrikstrid ]; }; } diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix index 63c5a0b61baf..e9b260b2c144 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix @@ -2,15 +2,32 @@ , happy-eyeballs , cmdliner , dns-client +, duration +, domain-name +, ipaddr +, fmt , logs , lwt +, mtime }: buildDunePackage { pname = "happy-eyeballs-lwt"; + inherit (happy-eyeballs) src version; - buildInputs = [ cmdliner ]; + minimalOCamlVersion = "4.08"; + + strictDeps = true; + + buildInputs = [ + cmdliner + duration + domain-name + ipaddr + fmt + mtime + ]; propagatedBuildInputs = [ dns-client @@ -19,8 +36,10 @@ buildDunePackage { lwt ]; + doCheck = true; + meta = happy-eyeballs.meta // { + mainProgram = "happy_eyeballs_client"; description = "Connecting to a remote host via IP version 4 or 6 using Lwt_unix"; }; - } diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix index a47f7afa00c7..c30348777634 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix @@ -1,15 +1,37 @@ { buildDunePackage , happy-eyeballs +, duration , dns-client +, domain-name +, ipaddr +, fmt , logs , lwt +, mirage-clock +, mirage-random +, mirage-time , tcpip }: buildDunePackage { pname = "happy-eyeballs-mirage"; + inherit (happy-eyeballs) src version; + minimalOCamlVersion = "4.08"; + + strictDeps = true; + + buildInputs = [ + duration + ipaddr + domain-name + fmt + mirage-clock + mirage-random + mirage-time + ]; + propagatedBuildInputs = [ dns-client happy-eyeballs @@ -18,8 +40,9 @@ buildDunePackage { tcpip ]; + doCheck = true; + meta = happy-eyeballs.meta // { description = "Connecting to a remote host via IP version 4 or 6 using Mirage"; }; - }