cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #263054 from uninsane/pr-trust-dns-0.24.0

Browse source 
trust-dns: 0.23.0 -> 0.24.0
This commit is contained in:
Felix Bühler 2023-11-08 19:35:23 +01:00 committed by GitHub
commit 7aaa664cc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/networking/trust-dns.nix
View file

@ -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";

11
pkgs/servers/dns/trust-dns/default.nix
View file

@ -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";
};
}