mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00
Code Issues Wiki Activity

knot-dns: 3.3.9 -> 3.4.0

Browse source 
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
This commit is contained in:
Vladimír Čunát 2024-09-02 14:28:48 +02:00
parent 3007f981ee
commit 0ea1446704
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/servers/dns/knot-dns/default.nix
View file

@ -1,17 +1,18 @@
{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl
, ngtcp2-gnutls, xdp-tools , ngtcp2-gnutls, xdp-tools
, sphinx
, autoreconfHook , autoreconfHook
, nixosTests, knot-resolver, knot-dns, runCommandLocal , nixosTests, knot-resolver, knot-dns, runCommandLocal
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "knot-dns"; pname = "knot-dns";
version = "3.3.9"; version = "3.4.0";
src = fetchurl { src = fetchurl {
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "7cf2bd93bf487179aca1d2acf7b462dc269e769944c3ea73c7f9a4570dde86ab"; sha256 = "2730b11398944faa5151c51b0655cf26631090343c303597814f2a57df424736";
}; };
outputs = [ "bin" "out" "dev" ]; outputs = [ "bin" "out" "dev" ];
@ -29,7 +30,8 @@ stdenv.mkDerivation rec {
./runtime-deps.patch ./runtime-deps.patch
]; ];
nativeBuildInputs = [ pkg-config autoreconfHook ]; # FIXME: sphinx is needed for now to get man-pages
nativeBuildInputs = [ pkg-config autoreconfHook sphinx ];
buildInputs = [ buildInputs = [
gnutls liburcu libidn2 libunistring gnutls liburcu libidn2 libunistring
nettle libedit nettle libedit

7
pkgs/servers/dns/knot-dns/runtime-deps.patch
View file

@ -5,10 +5,9 @@ but that contains also references like include paths.
Filter these at least in a crude way (whole lines). Filter these at least in a crude way (whole lines).
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -766,5 +766,5 @@ result_msg_base=" Knot DNS $VERSION @@ -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 "$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')
+result_msg_esc=$(echo -n "$result_msg_base" | grep -Fv "$NIX_STORE" | sed '$!s/$/\\n/' | tr -d '\n')
AC_DEFINE_UNQUOTED([CONFIGURE_SUMMARY],["$result_msg_esc"],[Configure summary]) AC_DEFINE_UNQUOTED([CONFIGURE_SUMMARY],["$result_msg_esc"],[Configure summary])