Merge pull request #301747 from flokli/revert-knot-resolver-workaround

knot-resolver: re-enable http module
This commit is contained in:
Florian Klink 2024-04-05 12:26:32 +03:00 committed by GitHub
commit b22fabbd3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 4 deletions

View File

@ -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,8 +118,7 @@ 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 \
--set LUA_PATH "$LUA_PATH" \