summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Kenji Okada <thiagokokada@gmail.com>2021-12-23 12:10:03 -0300
committerGitHub <noreply@github.com>2021-12-23 12:10:03 -0300
commit1cfebd0dc90afd2ddd8ae0b67d618cd95897af4a (patch)
tree71dd4fc337448046d14c16347336bd8b83e82c39
parentMerge pull request #151789 from NixOS/backport-151689-to-release-21.11 (diff)
parentknot-dns: make passthru.tests usable on non-Linux (diff)
downloadnixpkgs-1cfebd0dc90afd2ddd8ae0b67d618cd95897af4a.tar.gz
Merge pull request #151756 from NixOS/backport-151426-to-release-21.11
[Backport release-21.11] knot-dns: 3.1.4 -> 3.1.5
-rw-r--r--pkgs/servers/dns/knot-dns/default.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 2c731b4f1ff8..1938e9c02b66 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -1,15 +1,15 @@
{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl
-, autoreconfHook, nixosTests
+, autoreconfHook, nixosTests, knot-resolver
}:
stdenv.mkDerivation rec {
pname = "knot-dns";
- version = "3.1.4";
+ version = "3.1.5";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
- sha256 = "05ebca053b4ce62205a095b6885ed1a1167c629ccac2b3c8dcc431bd2deedf70";
+ sha256 = "2da6e50b0662297d55f80e349568224e07fe88cad20bee1d2e22f54bb32da064";
};
outputs = [ "bin" "out" "dev" ];
@@ -53,7 +53,11 @@ stdenv.mkDerivation rec {
rm -r "$out"/lib/*.la
'';
- passthru.tests = { inherit (nixosTests) knot; };
+ passthru.tests = {
+ inherit knot-resolver;
+ } // lib.optionalAttrs stdenv.isLinux {
+ inherit (nixosTests) knot;
+ };
meta = with lib; {
description = "Authoritative-only DNS server from .cz domain registry";