Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #100420 from rnhmjoj/powerdns-backports
[20.09] Powerdns backports
  • Loading branch information
rnhmjoj committed Oct 13, 2020
2 parents 5f9c8a1 + bfe193c commit a8da27d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 10 deletions.
4 changes: 2 additions & 2 deletions pkgs/servers/dns/dnsdist/default.nix
Expand Up @@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
buildInputs = [ systemd boost libsodium libedit re2 net-snmp lua openssl zlib h2o ];

configureFlags = [
"--enable-libsodium"
"--enable-re2"
"--with-libsodium"
"--with-re2"
"--enable-dnscrypt"
"--enable-dns-over-tls"
"--enable-dns-over-https"
Expand Down
10 changes: 7 additions & 3 deletions pkgs/servers/dns/pdns-recursor/default.nix
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, boost
{ stdenv, fetchurl, pkgconfig, boost, nixosTests
, openssl, systemd, lua, luajit, protobuf
, enableProtoBuf ? false
}:
Expand All @@ -8,11 +8,11 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "pdns-recursor";
version = "4.3.3";
version = "4.3.5";

src = fetchurl {
url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
sha256 = "020mx8mh6zrixkhsc2p1c2ccl9zfypay988jjxbk6ql020flig0b";
sha256 = "0mggqi4588mg6vpgplk9b4ak6msdf279lxkblv563l2vjiyfmfcc";
};

nativeBuildInputs = [ pkgconfig ];
Expand All @@ -28,6 +28,10 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

passthru.tests = {
nixos = nixosTests.pdns-recursor;
};

meta = {
description = "A recursive DNS server";
homepage = "https://www.powerdns.com/";
Expand Down
14 changes: 9 additions & 5 deletions pkgs/servers/dns/powerdns/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig
, boost, libyamlcpp, libsodium, sqlite, protobuf, botan2, openssl
{ stdenv, fetchurl, pkgconfig, nixosTests
, boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd
, mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC
}:

Expand All @@ -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 systemd
];

# nix destroy with-modules arguments, when using configureFlags
Expand All @@ -25,19 +25,23 @@ 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
--enable-reproducible
--enable-unit-tests
--enable-systemd
)
'';

enableParallelBuilding = true;
doCheck = true;

passthru.tests = {
nixos = nixosTests.powerdns;
};

meta = with stdenv.lib; {
description = "Authoritative DNS server";
homepage = "https://www.powerdns.com";
Expand Down

0 comments on commit a8da27d

Please sign in to comment.