summary refs log tree commit diff
path: root/pkgs/servers/dns/knot-resolver
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-03-04 13:35:43 +0100
committerVladimír Čunát <v@cunat.cz>2020-03-04 13:36:54 +0100
commitb7f5450e4dcfb0ba7a61c2236246a0d670e887ab (patch)
tree5b47df21517561bcf3c993cd99a20bc043e17fb8 /pkgs/servers/dns/knot-resolver
parent5760e001caae703488e1c57229e32fa5ca0f4088 (diff)
downloadnixpkgs-b7f5450e4dcfb0ba7a61c2236246a0d670e887ab.tar
nixpkgs-b7f5450e4dcfb0ba7a61c2236246a0d670e887ab.tar.gz
nixpkgs-b7f5450e4dcfb0ba7a61c2236246a0d670e887ab.tar.bz2
nixpkgs-b7f5450e4dcfb0ba7a61c2236246a0d670e887ab.tar.lz
nixpkgs-b7f5450e4dcfb0ba7a61c2236246a0d670e887ab.tar.xz
nixpkgs-b7f5450e4dcfb0ba7a61c2236246a0d670e887ab.tar.zst
nixpkgs-b7f5450e4dcfb0ba7a61c2236246a0d670e887ab.zip
knot-resolver: apply upstream patch
Encrypted ZFS users were affected, in particular some NixOS users
who reported the issue upstream.  Close #81188.
Diffstat (limited to 'pkgs/servers/dns/knot-resolver')
-rw-r--r--pkgs/servers/dns/knot-resolver/default.nix8
1 files changed, 8 insertions, 0 deletions
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.