From 83657ee1601ce7535211e6ae3737004c16a09bd9 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Jul 2022 16:19:01 +0800 Subject: [PATCH 1/2] pdns: 4.6.2 -> 4.6.3, fix pname --- pkgs/servers/dns/pdns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index 9dddfb03089d..beee5d3a4d77 100644 --- a/pkgs/servers/dns/pdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - pname = "powerdns"; - version = "4.6.2"; + pname = "pdns"; + version = "4.6.3"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; - hash = "sha256-9EOEiUS7Ebu0hQIhYTs6Af+1f+vyZx2myqVzYu4LGbg="; + hash = "sha256-rNBricoB0a32G5BmBGFPDh13oelO7srej/XVOhbbc4k="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; From aaebb21a9e6104106eb0c208c114e8f13ad38649 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Jul 2022 16:29:16 +0800 Subject: [PATCH 2/2] nixosTests.powerdns: fix test script for type checking --- nixos/tests/powerdns.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/powerdns.nix b/nixos/tests/powerdns.nix index 70060bad87b6..d3708d25f0fb 100644 --- a/nixos/tests/powerdns.nix +++ b/nixos/tests/powerdns.nix @@ -47,7 +47,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { with subtest("Adding an example zone works"): # Extract configuration file needed by pdnsutil unit = server.succeed("systemctl cat pdns") - conf = re.search("(--config-dir=[^ ]+)", unit).group(1) + match = re.search("(--config-dir=[^ ]+)", unit) + assert(match is not None) + conf = match.group(1) pdnsutil = "sudo -u pdns pdnsutil " + conf server.succeed(f"{pdnsutil} create-zone example.com ns1.example.com") server.succeed(f"{pdnsutil} add-record example.com ns1 A 192.168.1.2")