mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-05 12:08:02 +03:00
Revert "knot-resolver: temporarily make it pass"
This reverts commit 4cad0502db
.
The underlying issue has been fixed in
https://github.com/NixOS/nixpkgs/pull/300905/files, this workaround is
not needed anymore.
This commit is contained in:
parent
80592f5bcd
commit
d6f46ee34e
@ -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,7 +118,6 @@ 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 \
|
||||||
|
Loading…
Reference in New Issue
Block a user