From eb13450fa392c7ecac47642c527052ba612d690f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 20 Dec 2021 16:19:44 +0100 Subject: [PATCH 1/3] knot-dns: 3.1.4 -> 3.1.5 https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.1.5 (cherry picked from commit 0fe64c69291b82c50c78c60b85f5c56606703342) --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 2c731b4f1ff8..76ac1057a83b 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -5,11 +5,11 @@ 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" ]; From fdca9124da65aa46eea30a5a7c6cc7b191aab95d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 20 Dec 2021 16:43:21 +0100 Subject: [PATCH 2/3] knot-dns: add knot-resolver build into passthru.tests (cherry picked from commit c83103e77ce9ccb54246a5830c63e0d7d922907d) --- pkgs/servers/dns/knot-dns/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 76ac1057a83b..ab7a152a81c0 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,6 +1,6 @@ { 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 { @@ -53,7 +53,10 @@ stdenv.mkDerivation rec { rm -r "$out"/lib/*.la ''; - passthru.tests = { inherit (nixosTests) knot; }; + passthru.tests = { + inherit (nixosTests) knot; + inherit knot-resolver; + }; meta = with lib; { description = "Authoritative-only DNS server from .cz domain registry"; From 267943798d4c4bf03c395897718d852a5e0ae34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 20 Dec 2021 17:17:55 +0100 Subject: [PATCH 3/3] knot-dns: make passthru.tests usable on non-Linux (cherry picked from commit b1c17320afa9e9d64be3380df8f7517aac277130) --- pkgs/servers/dns/knot-dns/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index ab7a152a81c0..1938e9c02b66 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -54,8 +54,9 @@ stdenv.mkDerivation rec { ''; passthru.tests = { - inherit (nixosTests) knot; inherit knot-resolver; + } // lib.optionalAttrs stdenv.isLinux { + inherit (nixosTests) knot; }; meta = with lib; {