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

trust-dns: 0.23.0 -> 0.24.0

authored by Felix Bühler and committed by GitHub 7aaa664c 65b1aa88

+8 -7
+2 -2
nixos/modules/services/networking/trust-dns.nix
··· 54 defaultText = "pkgs.trust-dns"; 55 description = mdDoc '' 56 Trust-dns package to use. 57 - Only `bin/trust-dns` need be provided: the other trust-dns utilities (client and resolver) are not needed. 58 ''; 59 }; 60 quiet = mkOption { ··· 135 flags = (lib.optional cfg.debug "--debug") ++ (lib.optional cfg.quiet "--quiet"); 136 flagsStr = builtins.concatStringsSep " " flags; 137 in '' 138 - ${cfg.package}/bin/trust-dns --config ${configFile} ${flagsStr} 139 ''; 140 Type = "simple"; 141 Restart = "on-failure";
··· 54 defaultText = "pkgs.trust-dns"; 55 description = mdDoc '' 56 Trust-dns package to use. 57 + The package must provide `meta.mainProgram` which names the server binary; any other utilities (client, resolver) are not needed. 58 ''; 59 }; 60 quiet = mkOption { ··· 135 flags = (lib.optional cfg.debug "--debug") ++ (lib.optional cfg.quiet "--quiet"); 136 flagsStr = builtins.concatStringsSep " " flags; 137 in '' 138 + ${cfg.package}/bin/${cfg.package.meta.mainProgram} --config ${configFile} ${flagsStr} 139 ''; 140 Type = "simple"; 141 Restart = "on-failure";
+6 -5
pkgs/servers/dns/trust-dns/default.nix
··· 7 8 rustPlatform.buildRustPackage rec { 9 pname = "trust-dns"; 10 - version = "0.23.0"; 11 12 src = fetchFromGitHub { 13 - owner = "bluejekyll"; 14 - repo = "trust-dns"; 15 rev = "v${version}"; 16 - sha256 = "sha256-CfFEhZEk1Z7VG0n8EvyQwHvZIOEES5GKpm5tMeqhRVY="; 17 }; 18 - cargoHash = "sha256-jmow/jtdbuKFovXWA5xbgM67iJmkwP35hiOivIJ5JdM="; 19 20 buildInputs = [ openssl ]; 21 nativeBuildInputs = [ pkg-config ]; ··· 29 maintainers = with maintainers; [ colinsane ]; 30 platforms = platforms.linux; 31 license = with licenses; [ asl20 mit ]; 32 }; 33 }
··· 7 8 rustPlatform.buildRustPackage rec { 9 pname = "trust-dns"; 10 + version = "0.24.0"; 11 12 src = fetchFromGitHub { 13 + owner = "hickory-dns"; 14 + repo = "hickory-dns"; 15 rev = "v${version}"; 16 + hash = "sha256-w87WpuFKSOdObNiqET/pp2sJql1q0+xyns8+nMPj0xE="; 17 }; 18 + cargoHash = "sha256-sLhhwSsyzdxq7V9rpD42cu76T1mt4uCOx2NAmIf5sF8="; 19 20 buildInputs = [ openssl ]; 21 nativeBuildInputs = [ pkg-config ]; ··· 29 maintainers = with maintainers; [ colinsane ]; 30 platforms = platforms.linux; 31 license = with licenses; [ asl20 mit ]; 32 + mainProgram = "hickory-dns"; 33 }; 34 }