From 1232a1835451c36872668ba33dd08651eccc97f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 28 Apr 2025 18:10:18 +0200
Subject: [PATCH 1/2] knot-resolver: 5.7.4 -> 5.7.5

https://gitlab.nic.cz/knot/knot-resolver/-/releases/v5.7.5#security
---
 pkgs/servers/dns/knot-resolver/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 73895b016128..3229cf99ef07 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -36,11 +36,11 @@ let # un-indented, over the whole file
 
   unwrapped = stdenv.mkDerivation rec {
     pname = "knot-resolver";
-    version = "5.7.4";
+    version = "5.7.5";
 
     src = fetchurl {
       url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
-      hash = "sha256-a22m7PBoKAQa+tRN+iJ3gfCuNK0YOmZwCFCTVdGL2cg=";
+      sha256 = "80239cf9aa92599d9cbad4642dea5520b2ccfbc9c6f968886ea46179cb3cdf66";
     };
 
     outputs = [
@@ -70,13 +70,6 @@ let # un-indented, over the whole file
             --replace "ffi.load(" "ffi.load('${lib.getLib knot-dns}/lib/' .. "
         done
       ''
-      # https://gitlab.nic.cz/knot/knot-resolver/-/issues/925
-      + ''
-        patch modules/http/meson.build <<EOF
-        @@ -22 +21,0 @@
-        -  ['http', files('http.test.lua')],
-        EOF
-      ''
       # some tests have issues with network sandboxing, apparently
       + optionalString doInstallCheck ''
         echo 'os.exit(77)' > daemon/lua/trust_anchors.test/bootstrap.test.lua

From bbdb7a3914e4de198d93a3f2e0e750c231a8ff61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 28 Apr 2025 18:13:33 +0200
Subject: [PATCH 2/2] knot-resolver: nit fixes

---
 pkgs/servers/dns/knot-resolver/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 3229cf99ef07..fd657e92a321 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -27,8 +27,7 @@
   cacert,
   extraFeatures ? false, # catch-all if defaults aren't enough
 }:
-let # un-indented, over the whole file
-
+let
   result = if extraFeatures then wrapped-full else unwrapped;
 
   inherit (lib) optional optionals optionalString;
@@ -67,7 +66,7 @@ let # un-indented, over the whole file
         # Even though they should already be loaded and they're in RPATH, too.
         for f in daemon/lua/{kres,zonefile}.lua; do
           substituteInPlace "$f" \
-            --replace "ffi.load(" "ffi.load('${lib.getLib knot-dns}/lib/' .. "
+            --replace-fail "ffi.load(" "ffi.load('${lib.getLib knot-dns}/lib/' .. "
         done
       ''
       # some tests have issues with network sandboxing, apparently