From 5bcee3f299c6894e595b29ab7dff37a133000d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 2 Feb 2023 12:34:15 +0100 Subject: [PATCH 1/3] knot-dns: 3.2.4 -> 3.2.5 https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.2.5 --- 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 7e255c01d35d..539dbd6a8065 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "299e8de918f9fc7ecbe625b41cb085e47cdda542612efbd51cd5ec60deb9dd13"; + sha256 = "c6b122e92baa179d09ba4c8ce5b0d42fb7475805f4ff9c81d5036acfaa161820"; }; outputs = [ "bin" "out" "dev" ]; From 7755cf6045ef177447adfc79d8b98970ee56c82c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 2 Feb 2023 12:44:29 +0100 Subject: [PATCH 2/3] ngtcp2-gnutls: 0.12.1 -> 0.13.0 https://github.com/ngtcp2/ngtcp2/releases/tag/v0.13.0 knot-dns-3.2.5 dropped compatibility with older versions. --- pkgs/development/libraries/ngtcp2/gnutls.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index ac8dec44412d..ef73f06e34a1 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - sha256 = "sha256-nUUbGNxr2pGiEoYbArHppNE29rki9SM/3MZWMS9HmqY="; + sha256 = "sha256-rKEF5R1GubgFiblmdTqh26PxTRxIqXUJHxj0Qwd3N00="; }; outputs = [ "out" "dev" ]; From 50c0e3188c0082e4197d903dc2f8992f374f6f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 3 Feb 2023 10:54:27 +0100 Subject: [PATCH 3/3] knot-resolver: avoid a flaky test The test is relatively sensitive on timing, so it can fail in case a builder is heavily loaded. In practice we occasionally see that on *-darwin. In distro such tests are more trouble than worth; and we keep running these upstream anyway. --- pkgs/servers/dns/knot-resolver/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index aee57689308f..ed64f6b791f4 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -90,7 +90,7 @@ unwrapped = stdenv.mkDerivation rec { doInstallCheck = with stdenv; hostPlatform == buildPlatform; nativeInstallCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ]; installCheckPhase = '' - meson test --print-errorlogs + meson test --print-errorlogs --no-suite snowflake ''; meta = with lib; {