Unverified Commit 336b43c5 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

knot-dns: 3.3.9 -> 3.4.0 (#338995)

parents c058bd0f 76d4d43c

nixos/doc/manual/release-notes/rl-2411.section.md

+2 −0
Original line number Diff line number Diff line
@@ -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.

nixos/tests/prometheus-exporters.nix

+0 −3
Original line number Diff line number Diff line
@@ -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";

pkgs/development/python-modules/libknot/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/servers/dns/knot-dns/default.nix

+5 −3
Original line number Diff line number Diff line 
{ 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

pkgs/servers/dns/knot-dns/runtime-deps.patch

+3 −4
Original line number Diff line number Diff line
@@ -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])