From 7b2b0cc77c48ae9d9da806aa7f89dd0ecaaedd33 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 8 Oct 2020 19:53:48 -0400 Subject: [PATCH 1/3] powerdns: update configure flags --- pkgs/servers/dns/powerdns/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 54dbf3c9e73..6be2240dad1 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, boost, libyamlcpp, libsodium, sqlite, protobuf, botan2, openssl +, boost, libyamlcpp, libsodium, sqlite, protobuf, openssl , mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip - libyamlcpp libsodium curl opendbx unixODBC botan2 openssl + libyamlcpp libsodium curl opendbx unixODBC openssl ]; # nix destroy with-modules arguments, when using configureFlags @@ -25,8 +25,7 @@ stdenv.mkDerivation rec { --with-sqlite3 --with-socketdir=/var/lib/powerdns --with-libcrypto=${openssl.dev} - --enable-libsodium - --enable-botan + --with-libsodium --enable-tools --disable-dependency-tracking --disable-silent-rules From 94c98805cbcd882a2b9eea9d0251d4f78308a83b Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 8 Oct 2020 20:14:11 -0400 Subject: [PATCH 2/3] powerdns: compile with systemd support --- pkgs/servers/dns/powerdns/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 6be2240dad1..197b3095ab0 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, boost, libyamlcpp, libsodium, sqlite, protobuf, openssl +, boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd , mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip - libyamlcpp libsodium curl opendbx unixODBC openssl + libyamlcpp libsodium curl opendbx unixODBC openssl systemd ]; # nix destroy with-modules arguments, when using configureFlags @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { --disable-silent-rules --enable-reproducible --enable-unit-tests + --enable-systemd ) ''; From 6019fb179b53c2ac0e7e88e1cf4b78d53c42326f Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 10 Oct 2020 07:58:03 -0400 Subject: [PATCH 3/3] powerdns: add nixos test to passthru.tests --- pkgs/servers/dns/powerdns/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 197b3095ab0..cacd5b7c54f 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkgconfig, nixosTests , boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd , mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC }: @@ -38,6 +38,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; + passthru.tests = { + nixos = nixosTests.powerdns; + }; + meta = with stdenv.lib; { description = "Authoritative DNS server"; homepage = "https://www.powerdns.com";