From 4d9bdff8258755c98e9187f02c4bdffc31a0e3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 22 Aug 2022 09:38:43 +0200 Subject: [PATCH 1/2] knot-dns: 3.1.9 -> 3.2.0 This version brings various XDP-related features and improvements (namely QUIC and TCP) and many more: https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.2.0 --- 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 23fefe80e764..eeb3e51188b9 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.9"; + version = "3.2.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "sha256-s8pPHUROlf8n0gltPMWkfBDB1poeSIWuipcngfYnnYI="; + sha256 = "426d120994daf93af348aa6c48428e583dd286656415de4daf7a59106fd98631"; }; outputs = [ "bin" "out" "dev" ]; From 0b464c376f093b031c9a1cb7d6f8517bd632877f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 23 Aug 2022 16:18:21 +0200 Subject: [PATCH 2/2] knot-dns: patch an issue in i686-linux tests --- pkgs/servers/dns/knot-dns/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index eeb3e51188b9..427bdb597aa9 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , autoreconfHook, nixosTests, knot-resolver +, fetchpatch }: stdenv.mkDerivation rec { @@ -21,6 +22,11 @@ stdenv.mkDerivation rec { ]; patches = [ + (fetchpatch { + name = "test-32bit-xdp.patch"; + url = "https://gitlab.nic.cz/knot/knot-dns/-/commit/325dfeefdfd8a3dd318cfe0ab52cd7efbf839ccd.diff"; + sha256 = "E5J2Jf4/m5H59Xn6TyATu2gKs3CgShYlMF2Qj1SW1zw="; + }) # Don't try to create directories like /var/lib/knot at build time. # They are later created from NixOS itself. ./dont-create-run-time-dirs.patch