From 5f86f5d5b185329d7d859c81b3c809f365706e80 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Fri, 3 Nov 2017 10:57:15 +0100
Subject: knot-dns: maintenance 2.6.0 -> 2.6.1

https://lists.nic.cz/pipermail/knot-dns-users/2017-November/001241.html
---
 pkgs/servers/dns/knot-dns/default.nix | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'pkgs/servers/dns')

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 81d6d54df69c..9207ceb12f1a 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -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 ];
-- 
cgit 1.4.1