From 2afe544fe56bb9f70a259031e7bd0adbfd056f59 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 2 Aug 2021 09:18:06 +0200 Subject: knot-dns: 3.0.8 -> 3.1.0 NEWS + migration guide: https://gitlab.nic.cz/knot/knot-dns/-/tags/v3.1.0 https://www.knot-dns.cz/docs/3.1/html/migration.html#upgrade-3-0-x-to-3-1-x --- pkgs/servers/dns/knot-dns/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/servers/dns/knot-dns/default.nix') diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index e5192b7b3c1..fb4efba383c 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring -, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2 +, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , autoreconfHook, nixosTests }: @@ -7,11 +7,11 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.0.8"; + version = "3.1.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "df723949c19ebecf9a7118894c3127e292eb09dc7274b5ce9b527409f42edfb0"; + sha256 = "54323712e3cbc3d4c70a15777818fd2ff0de30cebb6c22e2946372b15b2653ed"; }; outputs = [ "bin" "out" "dev" ]; @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { libiconv lmdb libintl nghttp2 # DoH support in kdig libmaxminddb # optional for geoip module (it's tiny) + libmnl # required for knot >= 3.1 # without sphinx &al. for developer documentation # TODO: add dnstap support? ] -- cgit 1.4.1 From 0b06ccd7bec896d116d50c10d523c9be709abfbc Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Mon, 2 Aug 2021 13:12:10 +0200 Subject: knot-dns: cleanup --- pkgs/servers/dns/knot-dns/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'pkgs/servers/dns/knot-dns/default.nix') diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index fb4efba383c..3e3bcaf1e00 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -3,8 +3,6 @@ , autoreconfHook, nixosTests }: -let inherit (lib) optional optionals; in - stdenv.mkDerivation rec { pname = "knot-dns"; version = "3.1.0"; @@ -39,12 +37,10 @@ stdenv.mkDerivation rec { libmnl # required for knot >= 3.1 # without sphinx &al. for developer documentation # TODO: add dnstap support? - ] - ++ optionals stdenv.isLinux [ - libcap_ng systemd - libbpf # XDP support - ] - ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls + ] ++ lib.optionals stdenv.isLinux [ + libcap_ng systemd + libbpf # XDP support + ] ++ lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls enableParallelBuilding = true; -- cgit 1.4.1 From 895ce97eeadded30c897022b1768b645df21501e Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 2 Aug 2021 16:29:01 +0200 Subject: knot-dns: disable tests broken on aarch64-darwin Upstream is aware but they don't have a fix yet. I'm not aware of NixPkgs being used for another platform affected by this (e.g. ppc64le). --- pkgs/servers/dns/knot-dns/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs/servers/dns/knot-dns/default.nix') diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index fb4efba383c..d5f06610665 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -29,6 +29,12 @@ stdenv.mkDerivation rec { ./runtime-deps.patch ]; + # Disable knotd journal tests on platforms that don't use 4k sysconf(_SC_PAGESIZE). + # The journal most likely works fine, but some of the tests currently don't. + postPatch = lib.optionalString (doCheck && stdenv.isDarwin && stdenv.isAarch64) '' + sed '/^\tknot\/test_journal\>/d' -i tests/Makefile.am + ''; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ gnutls liburcu libidn2 libunistring -- cgit 1.4.1 From 18ed0855baceb757ef6f58101f62c4a8ddadb8ae Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 2 Aug 2021 18:41:36 +0200 Subject: knot-dns: only depend on libmnl on Linux I didn't realize that it's only relevant for Linux, and it unnecessarily disabled builds for *-darwin. --- pkgs/servers/dns/knot-dns/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs/servers/dns/knot-dns/default.nix') diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index e6f17b599a2..34032aa3597 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -40,12 +40,11 @@ stdenv.mkDerivation rec { libiconv lmdb libintl nghttp2 # DoH support in kdig libmaxminddb # optional for geoip module (it's tiny) - libmnl # required for knot >= 3.1 # without sphinx &al. for developer documentation # TODO: add dnstap support? ] ++ lib.optionals stdenv.isLinux [ libcap_ng systemd - libbpf # XDP support + libbpf libmnl # XDP support (it's Linux kernel API) ] ++ lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls enableParallelBuilding = true; -- cgit 1.4.1