From b7f5450e4dcfb0ba7a61c2236246a0d670e887ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 4 Mar 2020 13:35:43 +0100 Subject: [PATCH] knot-resolver: apply upstream patch Encrypted ZFS users were affected, in particular some NixOS users who reported the issue upstream. Close #81188. --- pkgs/servers/dns/knot-resolver/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index c1c826b7812..ccb9a859059 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -23,6 +23,14 @@ unwrapped = stdenv.mkDerivation rec { sha256 = "4a93264ad0cda7ea2252d1ba057e474722f77848165f2893e0c76e21ae406415"; }; + patches = [ + (fetchpatch { # merged to upstream master, remove on update + name = "zfs-cpu-usage.diff"; + url = "https://gitlab.labs.nic.cz/knot/knot-resolver/merge_requests/946.diff"; + sha256 = "0mcvx4pfnl19h6zrv2fcgxdjarqzczn2dz85sylcczsfvdmn6i5m"; + }) + ]; + outputs = [ "out" "dev" ]; # Path fixups for the NixOS service.