commit 57ad5dc8440d341dfb600730785a75b98d663cd8 · pyrox.dev/nixpkgs

+1

nixos/release.nix

···

       330
       330
        
         tests.postgresql = callSubTests tests/postgresql.nix {};

     

       331
       331
        
         tests.pgmanage = callTest tests/pgmanage.nix {};

     

       332
       332
        
         tests.postgis = callTest tests/postgis.nix {};

     

       333
       333
       +
         tests.powerdns = callTest tests/powerdns.nix {};

     

       333
       334
        
         #tests.pgjwt = callTest tests/pgjwt.nix {};

     

       334
       335
        
         tests.predictable-interface-names = callSubTests tests/predictable-interface-names.nix {};

     

       335
       336
        
         tests.printing = callTest tests/printing.nix {};

+12

nixos/tests/powerdns.nix

···

       1
       1
       +
       import ./make-test.nix ({ pkgs, ... }: {

     

       2
       2
       +
         name = "powerdns";

     

       3
       3
       +
       

     

       4
       4
       +
         nodes.server = { config, pkgs, ... }: {

     

       5
       5
       +
           services.powerdns.enable = true;

     

       6
       6
       +
         };

     

       7
       7
       +
       

     

       8
       8
       +
         testScript = ''

     

       9
       9
       +
           $server->waitForUnit("pdns");

     

       10
       10
       +
           $server->succeed("${pkgs.dnsutils}/bin/dig version.bind txt chaos \@127.0.0.1");

     

       11
       11
       +
         '';

     

       12
       12
       +
       })

+18 -8

pkgs/servers/dns/powerdns/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, pkgconfig,

     

       2
       2
       -
         boost, libyamlcpp, libsodium, sqlite, protobuf,

     

       3
       3
       -
         mysql57, postgresql, lua, openldap, geoip, curl

     

       1
       1
       +
       { stdenv, fetchurl, pkgconfig

     

       2
       2
       +
       , boost, libyamlcpp, libsodium, sqlite, protobuf, botan2

     

       3
       3
       +
       , mysql57, postgresql, lua, openldap, geoip, curl, opendbx, unixODBC

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         name = "powerdns-${version}";

     

       8
       8
       -
         version = "4.0.5";

     

       8
       8
       +
         version = "4.1.1";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchurl {

     

       11
       11
        
           url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";

     

       12
       12
       -
           sha256 = "097ci4s2c63gl0bil8yh87dsy0sk3fds4w8cpyjh5kns6zazmj2v";

     

       12
       12
       +
           sha256 = "1fh4zgj0gxgcnnhnih8k6fbw18hb9brkkrfpx3mj8b4a3hr8ilq8";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         nativeBuildInputs = [ pkgconfig ];

     

       16
       16
       -
         buildInputs = [ boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip libyamlcpp libsodium curl ];

     

       16
       16
       +
         buildInputs = [

     

       17
       17
       +
           boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip

     

       18
       18
       +
           libyamlcpp libsodium curl opendbx unixODBC botan2

     

       19
       19
       +
         ];

     

       20
       20
       +
       

     

       21
       21
       +
         patches = [

     

       22
       22
       +
           # checksum type not found, maybe a dependency is to old?

     

       23
       23
       +
           ./skip-sha384-test.patch

     

       24
       24
       +
         ];

     

       17
       25
        
       

     

       18
       26
        
         # nix destroy with-modules arguments, when using configureFlags

     

       19
       27
        
         preConfigure = ''

     

       20
       28
        
           configureFlagsArray=(

     

       21
       21
       -
             "--with-modules=bind gmysql geoip gpgsql gsqlite3 ldap lua pipe random remote"

     

       29
       29
       +
             "--with-modules=bind gmysql geoip godbc gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote"

     

       22
       30
        
             --with-sqlite3

     

       23
       31
        
             --with-socketdir=/var/lib/powerdns

     

       24
       32
        
             --enable-libsodium

     

       33
       33
       +
             --enable-botan

     

       25
       34
        
             --enable-tools

     

       26
       35
        
             --disable-dependency-tracking

     

       27
       36
        
             --disable-silent-rules

     
···

       29
       38
        
             --enable-unit-tests

     

       30
       39
        
           )

     

       31
       40
        
         '';

     

       32
       32
       -
         checkPhase = "make check";

     

       41
       41
       +
       

     

       42
       42
       +
         doCheck = true;

     

       33
       43
        
       

     

       34
       44
        
         meta = with stdenv.lib; {

     

       35
       45
        
           description = "Authoritative DNS server";

+14

pkgs/servers/dns/powerdns/skip-sha384-test.patch

···

       1
       1
       +
       --- pdns-4.1.1.org/pdns/test-signers.cc	2018-02-17 11:43:15.953228279 +0000

     

       2
       2
       +
       +++ pdns-4.1.1/pdns/test-signers.cc	2018-02-17 11:44:21.089516393 +0000

     

       3
       3
       +
       @@ -212,11 +212,6 @@

     

       4
       4
       +
              BOOST_CHECK_EQUAL(ds2.getZoneRepresentation(), signer.dsSHA256);

     

       5
       5
       +
            }

     

       6
       6
       +
        

     

       7
       7
       +
       -    auto ds4 = makeDSFromDNSKey(name, drc, DNSSECKeeper::SHA384);

     

       8
       8
       +
       -    if (!signer.dsSHA384.empty()) {

     

       9
       9
       +
       -      BOOST_CHECK_EQUAL(ds4.getZoneRepresentation(), signer.dsSHA384);

     

       10
       10
       +
       -    }

     

       11
       11
       +
       -

     

       12
       12
       +
            auto signature = dcke->sign(message);

     

       13
       13
       +
            BOOST_CHECK(dcke->verify(message, signature));

     

       14
       14
       +