diff options
| author | Ryan Mulligan <ryan@ryantm.com> | 2019-03-08 20:31:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-08 20:31:03 -0800 |
| commit | 08c589b90f6a3ba4a75a05a4c03539ee663893ee (patch) | |
| tree | 5738c6d43bdf17f9350718436d9be0e05193e103 /pkgs/servers | |
| parent | 4a48f6ac98bf3b389cc854840bb059b0a9e8241a (diff) | |
| parent | 3e4d8d2fc6535fa8119d858bc361f3d563bbd200 (diff) | |
| download | nixpkgs-08c589b90f6a3ba4a75a05a4c03539ee663893ee.tar nixpkgs-08c589b90f6a3ba4a75a05a4c03539ee663893ee.tar.gz nixpkgs-08c589b90f6a3ba4a75a05a4c03539ee663893ee.tar.bz2 nixpkgs-08c589b90f6a3ba4a75a05a4c03539ee663893ee.tar.lz nixpkgs-08c589b90f6a3ba4a75a05a4c03539ee663893ee.tar.xz nixpkgs-08c589b90f6a3ba4a75a05a4c03539ee663893ee.tar.zst nixpkgs-08c589b90f6a3ba4a75a05a4c03539ee663893ee.zip | |
Merge pull request #56974 from vcunat/p/knot-dns-2.8
knot-dns: 2.7.6 -> 2.8.0
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/dns/knot-dns/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/dns/knot-resolver/default.nix | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 659f8d5dea4..fd5e79b6efb 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.7.6"; + version = "2.8.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "a1cb1877f04f7c2549c977c2658cfafd07c7e0e924f8e8aa8d4ae4b707f697a2"; + sha256 = "494ad926705018bd754d96711dc2129f3173f326a0b57d33978090ba4eef87ef"; }; outputs = [ "bin" "out" "dev" ]; 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" |