ocamlPackages.dns: 6.1.4 -> 6.3.0

NixOS · Sep 21, 2022 · 1ef96c2 · 1ef96c2
1 parent fd82ce6
commit 1ef96c2
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 5 deletions.
diff --git a/pkgs/development/ocaml-modules/dns/cli.nix b/pkgs/development/ocaml-modules/dns/cli.nix
@@ -1,4 +1,4 @@
-{ buildDunePackage, dns, dns-tsig, dns-client, dns-server, dns-certify
+{ buildDunePackage, dns, dns-tsig, dns-client, dns-server, dns-certify, dnssec
 , bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk
 , mirage-crypto-rng, hex, ptime, mtime, logs, fmt, ipaddr, lwt
 , randomconv, alcotest
@@ -19,6 +19,7 @@ buildDunePackage {
     dns-client
     dns-server
     dns-certify
+    dnssec
     bos
     cmdliner
     fpath

diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix
@@ -1,19 +1,20 @@
 { lib, buildDunePackage, fetchurl, alcotest
 , cstruct, domain-name, duration, gmap, ipaddr, logs, lru, metrics, ptime, fmt
+, base64
 }:
 
 buildDunePackage rec {
   pname = "dns";
-  version = "6.1.4";
+  version = "6.3.0";
 
   minimalOCamlVersion = "4.08";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz";
-    sha256 = "sha256-nO9hRFOQzm3j57S1xTUC/j8ejSB+aDcsw/pOi893kHY=";
+    sha256 = "sha256-3EAjenN9EIi4PsXCZDevmEPDaS4xbESbcbB7pFgwc1E=";
   };
 
-  propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics ];
+  propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ];
 
   doCheck = true;
   checkInputs = [ alcotest ];

diff --git a/pkgs/development/ocaml-modules/dns/dnssec.nix b/pkgs/development/ocaml-modules/dns/dnssec.nix
@@ -0,0 +1,30 @@
+{ buildDunePackage, cstruct, dns, mirage-crypto, mirage-crypto-pk, mirage-crypto-ec
+, domain-name, logs
+, alcotest, base64
+}:
+
+buildDunePackage {
+  pname = "dnssec";
+
+  inherit (dns) version src;
+
+  propagatedBuildInputs = [
+    cstruct
+    dns
+    mirage-crypto
+    mirage-crypto-pk
+    mirage-crypto-ec
+    domain-name
+    logs
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    alcotest
+    base64
+  ];
+
+  meta = dns.meta // {
+    description = "DNSSec support for OCaml-DNS";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/dns/resolver.nix b/pkgs/development/ocaml-modules/dns/resolver.nix
@@ -1,6 +1,6 @@
 { buildDunePackage, dns, dns-server, dns-mirage, lru, duration
 , randomconv, lwt, mirage-time, mirage-clock, mirage-random
-, tcpip, tls, tls-mirage
+, tcpip, tls, tls-mirage, dnssec
 , alcotest
 }:
 
@@ -13,6 +13,7 @@ buildDunePackage {
     dns
     dns-server
     dns-mirage
+    dnssec
     lru
     duration
     randomconv

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
@@ -319,6 +319,8 @@ let
 
     dns-tsig = callPackage ../development/ocaml-modules/dns/tsig.nix { };
 
+    dnssec = callPackage ../development/ocaml-modules/dns/dnssec.nix { };
+
     dolmen =  callPackage ../development/ocaml-modules/dolmen { };
 
     dolog = callPackage ../development/ocaml-modules/dolog { };