diff options
| author | sternenseemann <git@lukasepple.de> | 2020-04-23 18:24:15 +0200 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-04-25 14:51:05 +0200 |
| commit | 0c4386bf0a55a7332c0948abcd9c875e8627847f (patch) | |
| tree | 401343f8b57ad4d4c9456f35f54269c2c81f7739 | |
| parent | b5f9eb06b5a2e6513944283ecef97be1d4c92509 (diff) | |
ocamlPackages.dns(-client): 4.4.1 -> 4.5.0
jackline: 2020-03-22 -> 2020-04-24
Dependency mtime is no longer needed
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/jackline/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/dns/client.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/dns/default.nix | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 92857aa1a667..f2b026e79dac 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -4,19 +4,19 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.07"; stdenv.mkDerivation { pname = "jackline"; - version = "unstable-2020-03-22"; + version = "unstable-2020-04-24"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "52f84525c74c43e8d03fb1e6ff025ccb2699e4aa"; - sha256 = "0wir573ah1w16xzdn9rfwk3569zq4ff5frp0ywq70va4gdlb679c"; + rev = "885b97b90d565f5f7c2b5f66f5edf14a82251b87"; + sha256 = "1mdn413ya2g0a1mrdbh1b65gnygrxb08k99z5lmidhh34kd1llsj"; }; buildInputs = with ocamlPackages; [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_deriving erm_xmpp tls mirage-crypto mirage-crypto-pk x509 domain-name - ocaml_lwt otr astring ptime mtime notty sexplib hex uutf + ocaml_lwt otr astring ptime notty sexplib hex uutf dns-client base64 ]; diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix index d007533fe45b..0dd0541138c8 100644 --- a/pkgs/development/ocaml-modules/dns/client.nix +++ b/pkgs/development/ocaml-modules/dns/client.nix @@ -1,10 +1,14 @@ -{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-random, mirage-stack, mtime, randomconv }: +{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-time +, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv }: buildDunePackage { pname = "dns-client"; inherit (dns) src version; - propagatedBuildInputs = [ dns mtime ocaml_lwt mirage-clock mirage-random mirage-stack randomconv ]; + useDune2 = true; + + propagatedBuildInputs = [ dns mtime ocaml_lwt randomconv mirage-clock mirage-time + mirage-random mirage-stack mirage-crypto-rng ]; meta = dns.meta // { description = "Pure DNS resolver API"; diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index e2aac3367bfa..01bbffd40b94 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "dns"; - version = "4.4.1"; + version = "4.5.0"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz"; - sha256 = "18c09jf0kicv2xz40n367y774rg8qs07rr1vdk8bx8f7hnaa9cn8"; + sha256 = "10jrnnxvp06rvzk285wibyi9hn15qhjnqjy9xsfbwl8yhmzzqnq0"; }; propagatedBuildInputs = [ cstruct domain-name duration gmap ipaddr logs lru metrics ptime rresult ]; |