Unverified Commit 7aaa664c authored by Felix Bühler's avatar Felix Bühler Committed by GitHub
Browse files

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

trust-dns: 0.23.0 -> 0.24.0
parents 65b1aa88 83bf3ed8

nixos/modules/services/networking/trust-dns.nix

+2 −2
Original line number Diff line number Diff line
@@ -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";

pkgs/servers/dns/trust-dns/default.nix

+6 −5
Original line number Diff line number Diff line
@@ -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";

  };

}