Skip to content

Commit

Permalink
Merge pull request #107907 from sternenseemann/ocaml-dns-other-pkgs
Browse files Browse the repository at this point in the history
ocamlPackages.dns*: add missing related packages
  • Loading branch information
Ericson2314 committed Dec 30, 2020
2 parents dff06f0 + b1c18d0 commit 7ffce39
Show file tree
Hide file tree
Showing 8 changed files with 234 additions and 0 deletions.
33 changes: 33 additions & 0 deletions pkgs/development/ocaml-modules/dns/certify.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{ buildDunePackage, dns, dns-tsig, dns-mirage, randomconv, x509
, mirage-random, mirage-time, mirage-clock, mirage-stack
, logs, mirage-crypto-pk, mirage-crypto-rng, tls, lwt
}:

buildDunePackage {
pname = "dns-certify";

inherit (dns) version src useDune2 minimumOCamlVersion;

propagatedBuildInputs = [
dns
dns-tsig
dns-mirage
randomconv
x509
mirage-random
mirage-time
mirage-clock
mirage-stack
logs
mirage-crypto-pk
mirage-crypto-rng
tls
lwt
];

doCheck = true;

meta = dns.meta // {
description = "MirageOS let's encrypt certificate retrieval";
};
}
48 changes: 48 additions & 0 deletions pkgs/development/ocaml-modules/dns/cli.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{ buildDunePackage, dns, dns-tsig, dns-client, dns-server, dns-certify
, rresult, bos, cmdliner, fpath, x509, mirage-crypto, mirage-crypto-pk
, mirage-crypto-rng, hex, ptime, mtime, logs, fmt, ipaddr, lwt
, randomconv, alcotest
}:

buildDunePackage {
pname = "dns-cli";

minimumOCamlVersion = "4.08";

inherit (dns) version src useDune2;

# no need to propagate as this is primarily
# an executable package
buildInputs = [
dns
dns-tsig
dns-client
dns-server
dns-certify
rresult
bos
cmdliner
fpath
x509
mirage-crypto
mirage-crypto-pk
mirage-crypto-rng
hex
ptime
mtime
logs
fmt
ipaddr
lwt
randomconv
];

doCheck = true;
checkInputs = [
alcotest
];

meta = dns.meta // {
description = "Unix command line utilities using uDNS";
};
}
18 changes: 18 additions & 0 deletions pkgs/development/ocaml-modules/dns/mirage.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{ buildDunePackage, dns, mirage-stack, ipaddr, lwt }:

buildDunePackage {
pname = "dns-mirage";

inherit (dns) version src useDune2 minimumOCamlVersion;

propagatedBuildInputs = [
dns
mirage-stack
ipaddr
lwt
];

meta = dns.meta // {
description = "An opinionated Domain Name System (DNS) library";
};
}
32 changes: 32 additions & 0 deletions pkgs/development/ocaml-modules/dns/resolver.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{ buildDunePackage, dns, dns-server, dns-mirage, lru, duration
, randomconv, lwt, mirage-time, mirage-clock, mirage-random
, alcotest
}:

buildDunePackage {
pname = "dns-resolver";

inherit (dns) version src useDune2 minimumOCamlVersion;

propagatedBuildInputs = [
dns
dns-server
dns-mirage
lru
duration
randomconv
lwt
mirage-time
mirage-clock
mirage-random
];

doCheck = true;
checkInputs = [
alcotest
];

meta = dns.meta // {
description = "DNS resolver business logic";
};
}
34 changes: 34 additions & 0 deletions pkgs/development/ocaml-modules/dns/server.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{ buildDunePackage, dns, dns-mirage, randomconv, duration, lwt
, mirage-time, mirage-clock, mirage-stack, metrics
, alcotest, mirage-crypto-rng, dns-tsig, base64
}:

buildDunePackage {
pname = "dns-server";

inherit (dns) version src useDune2 minimumOCamlVersion;

propagatedBuildInputs = [
dns
dns-mirage
randomconv
duration
lwt
mirage-time
mirage-clock
mirage-stack
metrics
];

doCheck = true;
checkInputs = [
alcotest
mirage-crypto-rng
dns-tsig
base64
];

meta = dns.meta // {
description = "DNS server, primary and secondary";
};
}
33 changes: 33 additions & 0 deletions pkgs/development/ocaml-modules/dns/stub.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{ buildDunePackage, dns, dns-client, dns-mirage, dns-resolver, dns-tsig
, dns-server, duration, randomconv, lwt, mirage-time, mirage-clock
, mirage-random, mirage-stack, metrics
}:

buildDunePackage {
pname = "dns-stub";

inherit (dns) version src useDune2 minimumOCamlVersion;

propagatedBuildInputs = [
dns
dns-client
dns-mirage
dns-resolver
dns-tsig
dns-server
duration
randomconv
lwt
mirage-time
mirage-clock
mirage-random
mirage-stack
metrics
];

doCheck = true;

meta = dns.meta // {
description = "DNS stub resolver";
};
}
22 changes: 22 additions & 0 deletions pkgs/development/ocaml-modules/dns/tsig.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ buildDunePackage, dns, mirage-crypto, base64, alcotest }:

buildDunePackage {
pname = "dns-tsig";

inherit (dns) version src useDune2 minimumOCamlVersion;

propagatedBuildInputs = [
mirage-crypto
dns
base64
];

doCheck = true;
checkInputs = [
alcotest
];

meta = dns.meta // {
description = "TSIG support for DNS";
};
}
14 changes: 14 additions & 0 deletions pkgs/top-level/ocaml-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,22 @@ let

dns = callPackage ../development/ocaml-modules/dns { };

dns-certify = callPackage ../development/ocaml-modules/dns/certify.nix { };

dns-cli = callPackage ../development/ocaml-modules/dns/cli.nix { };

dns-client = callPackage ../development/ocaml-modules/dns/client.nix { };

dns-mirage = callPackage ../development/ocaml-modules/dns/mirage.nix { };

dns-resolver = callPackage ../development/ocaml-modules/dns/resolver.nix { };

dns-server = callPackage ../development/ocaml-modules/dns/server.nix { };

dns-stub = callPackage ../development/ocaml-modules/dns/stub.nix { };

dns-tsig = callPackage ../development/ocaml-modules/dns/tsig.nix { };

dolmen = callPackage ../development/ocaml-modules/dolmen { };

dolog = callPackage ../development/ocaml-modules/dolog { };
Expand Down

0 comments on commit 7ffce39

Please sign in to comment.