Merge pull request #301747 from flokli/revert-knot-resolver-workaround
knot-resolver: re-enable http module
This commit is contained in:
commit
b22fabbd3e
|
@ -53,8 +53,6 @@ unwrapped = stdenv.mkDerivation rec {
|
||||||
echo 'os.exit(77)' > daemon/lua/trust_anchors.test/bootstrap.test.lua
|
echo 'os.exit(77)' > daemon/lua/trust_anchors.test/bootstrap.test.lua
|
||||||
sed -E '/^[[:blank:]]*test_(dstaddr|headers),?$/d' -i \
|
sed -E '/^[[:blank:]]*test_(dstaddr|headers),?$/d' -i \
|
||||||
tests/config/doh2.test.lua modules/http/http_doh.test.lua
|
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 = ''
|
preConfigure = ''
|
||||||
|
@ -120,8 +118,7 @@ wrapped-full = runCommand unwrapped.name
|
||||||
allowSubstitutes = false;
|
allowSubstitutes = false;
|
||||||
inherit (unwrapped) meta;
|
inherit (unwrapped) meta;
|
||||||
}
|
}
|
||||||
(assert false; # FIXME: the http module won't work; see PR #286822
|
(''
|
||||||
''
|
|
||||||
mkdir -p "$out"/bin
|
mkdir -p "$out"/bin
|
||||||
makeWrapper '${unwrapped}/bin/kresd' "$out"/bin/kresd \
|
makeWrapper '${unwrapped}/bin/kresd' "$out"/bin/kresd \
|
||||||
--set LUA_PATH "$LUA_PATH" \
|
--set LUA_PATH "$LUA_PATH" \
|
||||||
|
|
Loading…
Reference in New Issue
Block a user