diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:54:22 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:54:22 +0000 |
commit | d2e147bedf251976ed99b94b6c905d6761f7a892 (patch) | |
tree | 9e0c62d61698916fd4627ed98d3d880c8fc0ab2e /pkgs/servers/dns/knot-dns/default.nix | |
parent | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (diff) | |
parent | c464dc811babfe316ed4ab7bbc12351122e69dd7 (diff) | |
download | nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.gz nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.bz2 nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.lz nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.xz nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.zst nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into master
Diffstat (limited to 'pkgs/servers/dns/knot-dns/default.nix')
-rw-r--r-- | pkgs/servers/dns/knot-dns/default.nix | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index e5192b7b3c1..34032aa3597 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -1,17 +1,15 @@ { 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 }: -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" ]; @@ -29,6 +27,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 @@ -38,12 +42,10 @@ stdenv.mkDerivation rec { libmaxminddb # optional for geoip module (it's tiny) # 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 libmnl # XDP support (it's Linux kernel API) + ] ++ lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls enableParallelBuilding = true; |