summary refs log tree commit diff
path: root/pkgs/servers/dns/knot-resolver
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2019-03-01 16:37:07 +0100
committerVladimír Čunát <vcunat@gmail.com>2019-03-06 19:19:13 +0100
commit3e4d8d2fc6535fa8119d858bc361f3d563bbd200 (patch)
tree5e88c4148dba0d3d1e239f5ba8acb07322d71e16 /pkgs/servers/dns/knot-resolver
parentcc6d98b0de5e242536644e376edb97e580674409 (diff)
downloadnixpkgs-3e4d8d2fc6535fa8119d858bc361f3d563bbd200.tar
nixpkgs-3e4d8d2fc6535fa8119d858bc361f3d563bbd200.tar.gz
nixpkgs-3e4d8d2fc6535fa8119d858bc361f3d563bbd200.tar.bz2
nixpkgs-3e4d8d2fc6535fa8119d858bc361f3d563bbd200.tar.lz
nixpkgs-3e4d8d2fc6535fa8119d858bc361f3d563bbd200.tar.xz
nixpkgs-3e4d8d2fc6535fa8119d858bc361f3d563bbd200.tar.zst
nixpkgs-3e4d8d2fc6535fa8119d858bc361f3d563bbd200.zip
knot-dns: 2.7.6 -> 2.8.0
https://gitlab.labs.nic.cz/knot/knot-dns/tags/v2.8.0
Some explanation for the patching is in this ML thread:
https://lists.nic.cz/pipermail/knot-dns-users/2019-March/001616.html
Diffstat (limited to 'pkgs/servers/dns/knot-resolver')
-rw-r--r--pkgs/servers/dns/knot-resolver/default.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 04d0a0cf8d0..3882db1124a 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, runCommand, pkgconfig, hexdump, which
+{ stdenv, fetchurl, fetchpatch, runCommand, pkgconfig, hexdump, which
 , knot-dns, luajit, libuv, lmdb, gnutls, nettle
 , cmocka, systemd, dns-root-data, makeWrapper
 , extraFeatures ? false /* catch-all if defaults aren't enough */
@@ -19,6 +19,14 @@ unwrapped = stdenv.mkDerivation rec {
     sha256 = "d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "support-libzscanner-2.8.diff";
+      url = "https://gitlab.labs.nic.cz/knot/knot-resolver/commit/186f263.diff";
+      sha256 = "19zqigvc7m2a4j6bk9whx7gj0v009568rz5qwk052z7pzfikr8mk";
+    })
+  ];
+
   # Short-lived cross fix, as upstream is migrating to meson anyway.
   postPatch = ''
     substituteInPlace platform.mk --replace "objdump" "$OBJDUMP"