Merge pull request #183935 from NickCao/pdns

pdns: 4.6.2 -> 4.6.3, fix pname and tests
This commit is contained in:
Bobby Rong 2022-08-16 23:14:16 +08:00 committed by GitHub
commit 89988e61c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

View file

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

View file

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