diff options
| author | Colin <colin@uninsane.org> | 2023-10-24 02:01:29 +0000 |
|---|---|---|
| committer | Colin <colin@uninsane.org> | 2023-11-06 15:38:23 +0000 |
| commit | 83bf3ed892ca3d97cacd5bf41b67a185622ad971 (patch) | |
| tree | ab080761846665cacb70b50903f7630f5dc330ec | |
| parent | 5babd0d512ec88b848924e1f2a1ae5585098ad75 (diff) | |
trust-dns: 0.23.0 -> 0.24.0
upstream is in the process of renaming to `hickory-dns`.
a consequence of this is that the main binary has been renamed from
`trust-dns` to `hickory-dns` and the repository has been moved (though
for the time being the old repo is still usable on account that it
redirects to the new one).
see: <https://bluejekyll.github.io/blog/posts/announcing-hickory-dns/>
| -rw-r--r-- | nixos/modules/services/networking/trust-dns.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/dns/trust-dns/default.nix | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/nixos/modules/services/networking/trust-dns.nix b/nixos/modules/services/networking/trust-dns.nix index 4196d124a2ab..758e33f16d38 100644 --- a/nixos/modules/services/networking/trust-dns.nix +++ b/nixos/modules/services/networking/trust-dns.nix @@ -54,7 +54,7 @@ in defaultText = "pkgs.trust-dns"; description = mdDoc '' Trust-dns package to use. - Only `bin/trust-dns` need be provided: the other trust-dns utilities (client and resolver) are not needed. + The package must provide `meta.mainProgram` which names the server binary; any other utilities (client, resolver) are not needed. ''; }; quiet = mkOption { @@ -135,7 +135,7 @@ in flags = (lib.optional cfg.debug "--debug") ++ (lib.optional cfg.quiet "--quiet"); flagsStr = builtins.concatStringsSep " " flags; in '' - ${cfg.package}/bin/trust-dns --config ${configFile} ${flagsStr} + ${cfg.package}/bin/${cfg.package.meta.mainProgram} --config ${configFile} ${flagsStr} ''; Type = "simple"; Restart = "on-failure"; diff --git a/pkgs/servers/dns/trust-dns/default.nix b/pkgs/servers/dns/trust-dns/default.nix index 88280cf51877..03814c365d7e 100644 --- a/pkgs/servers/dns/trust-dns/default.nix +++ b/pkgs/servers/dns/trust-dns/default.nix @@ -7,15 +7,15 @@ rustPlatform.buildRustPackage rec { pname = "trust-dns"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { - owner = "bluejekyll"; - repo = "trust-dns"; + owner = "hickory-dns"; + repo = "hickory-dns"; rev = "v${version}"; - sha256 = "sha256-CfFEhZEk1Z7VG0n8EvyQwHvZIOEES5GKpm5tMeqhRVY="; + hash = "sha256-w87WpuFKSOdObNiqET/pp2sJql1q0+xyns8+nMPj0xE="; }; - cargoHash = "sha256-jmow/jtdbuKFovXWA5xbgM67iJmkwP35hiOivIJ5JdM="; + cargoHash = "sha256-sLhhwSsyzdxq7V9rpD42cu76T1mt4uCOx2NAmIf5sF8="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ colinsane ]; platforms = platforms.linux; license = with licenses; [ asl20 mit ]; + mainProgram = "hickory-dns"; }; } |