Unverified Commit 05244906 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #212808: knot-resolver: 5.5.3 -> 5.6.0

parents 4fe4a0e8 d027021c

pkgs/servers/dns/knot-resolver/default.nix

+5 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
, runCommand, pkg-config, meson, ninja, makeWrapper

# build+runtime deps.

, knot-dns, luajitPackages, libuv, gnutls, lmdb

, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle

, jemalloc, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle

# test-only deps.

, cmocka, which, cacert

, extraFeatures ? false /* catch-all if defaults aren't enough */
@@ -17,11 +17,11 @@ lua = luajitPackages; 


unwrapped = stdenv.mkDerivation rec {

  pname = "knot-resolver";

  version = "5.5.3";

  version = "5.6.0";



  src = fetchurl {

    url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";

    sha256 = "a38f57c68b7d237d662784d8406e6098aad66a148f44dcf498d1e9664c5fed2d";

    sha256 = "0c82ae937b685dc477fb3176098e3dc106c898b7cd83553e5bc54dccb83c80d7";

  };



  outputs = [ "out" "dev" ];
@@ -63,7 +63,7 @@ unwrapped = stdenv.mkDerivation rec { 
  # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements

  buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ]

    ++ optionals stdenv.isLinux [ /*lib*/systemd libcap_ng ]

    ++ [ nghttp2 ]

    ++ [ jemalloc nghttp2 ]

    ## optional dependencies; TODO: dnstap

    ;
@@ -71,6 +71,7 @@ unwrapped = stdenv.mkDerivation rec { 
    "-Dkeyfile_default=${dns-root-data}/root.ds"

    "-Droot_hints=${dns-root-data}/root.hints"

    "-Dinstall_kresd_conf=disabled" # not really useful; examples are inside share/doc/

    "-Dmalloc=jemalloc"

    "--default-library=static" # not used by anyone

  ]

  ++ optional doInstallCheck "-Dunit_tests=enabled"