From 0ea1446704b7f7add26b1970295d3d2825930315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 2 Sep 2024 14:28:48 +0200 Subject: [PATCH 1/5] knot-dns: 3.3.9 -> 3.4.0 https://www.knot-dns.cz/docs/latest/html/migration.html#upgrade-3-3-x-to-3-4-x https://gitlab.nic.cz/knot/knot-dns/-/releases/v3.4.0 --- pkgs/servers/dns/knot-dns/default.nix | 8 +++++--- pkgs/servers/dns/knot-dns/runtime-deps.patch | 7 +++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 12239f2f10df..e3926fe4947d 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,17 +1,18 @@ { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , ngtcp2-gnutls, xdp-tools +, sphinx , autoreconfHook , nixosTests, knot-resolver, knot-dns, runCommandLocal }: stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.3.9"; + version = "3.4.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "7cf2bd93bf487179aca1d2acf7b462dc269e769944c3ea73c7f9a4570dde86ab"; + sha256 = "2730b11398944faa5151c51b0655cf26631090343c303597814f2a57df424736"; }; outputs = [ "bin" "out" "dev" ]; @@ -29,7 +30,8 @@ stdenv.mkDerivation rec { ./runtime-deps.patch ]; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + # FIXME: sphinx is needed for now to get man-pages + nativeBuildInputs = [ pkg-config autoreconfHook sphinx ]; buildInputs = [ gnutls liburcu libidn2 libunistring nettle libedit diff --git a/pkgs/servers/dns/knot-dns/runtime-deps.patch b/pkgs/servers/dns/knot-dns/runtime-deps.patch index 19fc9cd07b18..89dba415b3b9 100644 --- a/pkgs/servers/dns/knot-dns/runtime-deps.patch +++ b/pkgs/servers/dns/knot-dns/runtime-deps.patch @@ -5,10 +5,9 @@ but that contains also references like include paths. Filter these at least in a crude way (whole lines). --- a/configure.ac +++ b/configure.ac -@@ -766,5 +766,5 @@ result_msg_base=" Knot DNS $VERSION - --result_msg_esc=$(echo -n "$result_msg_base" | sed '$!s/$/\\n/' | tr -d '\n') -+result_msg_esc=$(echo -n "$result_msg_base" | grep -Fv "$NIX_STORE" | sed '$!s/$/\\n/' | tr -d '\n') +@@ -788,5 +788,5 @@ result_msg_base=" +-result_msg_esc=$(echo -n " Configure:$filtered_config_params\n$result_msg_base" | sed '$!s/$/\\n/' | tr -d '\n') ++result_msg_esc=$(echo -n " Configure:$filtered_config_params\n$result_msg_base" | grep -Fv "$NIX_STORE" | sed '$!s/$/\\n/' | tr -d '\n') AC_DEFINE_UNQUOTED([CONFIGURE_SUMMARY],["$result_msg_esc"],[Configure summary]) From 8650d279f1dec2cca2f98f20a331892e91d6854c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 2 Sep 2024 14:35:31 +0200 Subject: [PATCH 2/5] python3Packages.libknot: 3.3.9 -> 3.4.0 --- pkgs/development/python-modules/libknot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index 03f249969a00..7d0ce1a2ed28 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.3.9"; + version = "3.4.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-AAjH5+IQdkzTIp1+q638d9dzAfo7nXUudOLQm81P7lU="; + hash = "sha256-BtESc9BIZeDNNPJYyMLTeMsNHm+xBcLueyJ7/1iXFos="; }; postPatch = '' From 9b586a40a0c2578473bca9b49bec80e0f4ef4532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 2 Sep 2024 14:36:19 +0200 Subject: [PATCH 3/5] prometheus-knot-exporter: 3.3.9 -> 3.4.0 --- pkgs/servers/monitoring/prometheus/knot-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index 5750b0116315..7b8003554438 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.3.9"; + version = "3.4.0"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-8OeMWEXnAaLYpZD/bKAm8vtf0mkGCavmJOV4ThWGDDo="; + hash = "sha256-YOVLHAJXIgje8Ek7iKGxq4l4PAcWgWnNllRxEJpUcU0="; }; nativeBuildInputs = [ From fcc561f3902f16563a40d4b66c2840336f79c814 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Sep 2024 15:20:36 +0200 Subject: [PATCH 4/5] nixos/tests/prometheus-exporters/knot: update for 3.4.0 Removes deprecated and now removed fields from the config. --- nixos/tests/prometheus-exporters.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 6a4abab7cc12..3d12ff128e26 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -530,9 +530,6 @@ let global-module: mod-stats dnssec-signing: off zonefile-sync: -1 - journal-db: /var/lib/knot/journal - kasp-db: /var/lib/knot/kasp - timer-db: /var/lib/knot/timer zonefile-load: difference storage: ${pkgs.buildEnv { name = "foo"; From 76d4d43c6f18bb37bfed00e55c7aa547896fa362 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Sep 2024 15:22:13 +0200 Subject: [PATCH 5/5] nixos/doc/rl-24.11: knot 3.4.0 migration guide --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 54541c24ea09..877f3411c8d7 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -125,6 +125,8 @@ - `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected. +- `knot-dns` has been updated to version 3.4.x. Check the [migration guide](https://www.knot-dns.cz/docs/latest/html/migration.html#upgrade-3-3-x-to-3-4-x) for breaking changes. + - `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema. - `wstunnel` has had a major version upgrade that entailed rewriting the program in Rust.