dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

knot-resolver: add support for new DoH implementation

Browse Source 
By default.  I'm not a DoH fan, but the difference in runtime closure
is really tiny (216 KiB by du).  I somehow forgot this during update.

Some of the newly running tests were failing and got disabled.
This commit is contained in:
Vladimír Čunát 2020-11-12 18:57:50 +01:00
parent a6c7b75e4d
commit 3087df3e8f
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/servers/dns/knot-resolver/default.nix
View File

@ -3,6 +3,7 @@
, runCommand, pkgconfig, meson, ninja, makeWrapper , runCommand, pkgconfig, meson, ninja, makeWrapper
# build+runtime deps. # build+runtime deps.
, knot-dns, luajitPackages, libuv, gnutls, lmdb, systemd, dns-root-data , knot-dns, luajitPackages, libuv, gnutls, lmdb, systemd, dns-root-data
, nghttp2
# test-only deps. # test-only deps.
, cmocka, which, cacert , cmocka, which, cacert
, extraFeatures ? false /* catch-all if defaults aren't enough */ , extraFeatures ? false /* catch-all if defaults aren't enough */
@ -11,7 +12,7 @@ let # un-indented, over the whole file
result = if extraFeatures then wrapped-full else unwrapped; result = if extraFeatures then wrapped-full else unwrapped;
inherit (stdenv.lib) optional optionals; inherit (stdenv.lib) optional optionals optionalString;
lua = luajitPackages; lua = luajitPackages;
unwrapped = stdenv.mkDerivation rec { unwrapped = stdenv.mkDerivation rec {
@ -38,6 +39,11 @@ unwrapped = stdenv.mkDerivation rec {
# ExecStart can't be overwritten in overrides. # ExecStart can't be overwritten in overrides.
# We need that to use wrapped executable and correct config file. # We need that to use wrapped executable and correct config file.
sed '/^ExecStart=/d' -i systemd/kresd@.service.in sed '/^ExecStart=/d' -i systemd/kresd@.service.in
''
# some tests have issues with network sandboxing, apparently
+ optionalString doInstallCheck ''
echo 'os.exit(77)' > daemon/lua/trust_anchors.test/bootstrap.test.lua
sed '/^[[:blank:]]*test_dstaddr,$/d' -i tests/config/doh2.test.lua
''; '';
preConfigure = '' preConfigure = ''
@ -49,6 +55,7 @@ unwrapped = stdenv.mkDerivation rec {
# http://knot-resolver.readthedocs.io/en/latest/build.html#requirements # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ]
++ optional stdenv.isLinux systemd # passing sockets, sd_notify ++ optional stdenv.isLinux systemd # passing sockets, sd_notify
++ [ nghttp2 ]
## optional dependencies; TODO: libedit, dnstap ## optional dependencies; TODO: libedit, dnstap
; ;
@ -71,7 +78,7 @@ unwrapped = stdenv.mkDerivation rec {
''; '';
doInstallCheck = with stdenv; hostPlatform == buildPlatform; doInstallCheck = with stdenv; hostPlatform == buildPlatform;
installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx ]; installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ];
installCheckPhase = '' installCheckPhase = ''
meson test --print-errorlogs meson test --print-errorlogs
''; '';