From d6f46ee34e62a5dfff79a9e94f034df322423e42 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 5 Apr 2024 00:53:17 +0300 Subject: [PATCH] Revert "knot-resolver: temporarily make it pass" This reverts commit 4cad0502dbb4e9ca487b7b59d8f936d5ad64b7f8. The underlying issue has been fixed in https://github.com/NixOS/nixpkgs/pull/300905/files, this workaround is not needed anymore. --- pkgs/servers/dns/knot-resolver/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index f64bc5a1fc01..6bb931a961fc 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -53,8 +53,6 @@ unwrapped = stdenv.mkDerivation rec { echo 'os.exit(77)' > daemon/lua/trust_anchors.test/bootstrap.test.lua sed -E '/^[[:blank:]]*test_(dstaddr|headers),?$/d' -i \ tests/config/doh2.test.lua modules/http/http_doh.test.lua - '' + /* FIXME: see PR #286822 */ '' - sed '/doh2\.test\.lua/d' -i tests/config/meson.build ''; preConfigure = '' @@ -120,7 +118,6 @@ wrapped-full = runCommand unwrapped.name allowSubstitutes = false; inherit (unwrapped) meta; } - assert false; # FIXME: the http module won't work; see PR #286822 ('' mkdir -p "$out"/bin makeWrapper '${unwrapped}/bin/kresd' "$out"/bin/kresd \