knot-dns: maintenance 2.6.0 -> 2.6.1

https://lists.nic.cz/pipermail/knot-dns-users/2017-November/001241.html
This commit is contained in:
Vladimír Čunát 2017-11-03 10:57:15 +01:00
parent 2e6daff704
commit 5f86f5d5b1
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA

View File

@ -1,6 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnutls, jansson, liburcu, lmdb, libcap_ng, libidn
, systemd, nettle, libedit, zlib, libiconv, libintlOrEmpty
, fetchpatch
}:
let inherit (stdenv.lib) optional optionals; in
@ -8,27 +7,13 @@ 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.6.0";
version = "2.6.1";
src = fetchurl {
url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
sha256 = "68e04961d0bf6ba193cb7ec658b295c4ff6e60b3754d64bcd77ebdcee0f283fd";
sha256 = "3013d45b4c7484268f3cad078f66f730a5bc9606e6b1061488dd821c1dce41e3";
};
patches = [
# remove both for >= 2.6.1
(fetchpatch {
name = "kdig-tls.patch";
url = "https://gitlab.labs.nic.cz/knot/knot-dns/commit/b72d5cd032795.diff";
sha256 = "0ig31rp82j49jh8n3s0dcf5abhh35mcp2k2wii7bh0c60ngb29k6";
})
(fetchpatch {
name = "kdig-tls-sni.patch";
url = "https://gitlab.labs.nic.cz/knot/knot-dns/commit/2e94ccee671ec70e.diff";
sha256 = "0psl6650v7g240i8w196v7zxy6j11d0aa6hm11b7vnaimjshgibv";
})
];
outputs = [ "bin" "out" "dev" ];
nativeBuildInputs = [ pkgconfig ];