[Backport release-24.11] knot-resolver: 5.7.4 -> 5.7.5 (#402964)

This commit is contained in:
Wolfgang Walther
2025-05-02 19:49:31 +00:00
committed by GitHub

View File

@@ -27,8 +27,7 @@
cacert,
extraFeatures ? false, # catch-all if defaults aren't enough
}:
let # un-indented, over the whole file
let
result = if extraFeatures then wrapped-full else unwrapped;
inherit (lib) optional optionals optionalString;
@@ -36,11 +35,11 @@ let # un-indented, over the whole file
unwrapped = stdenv.mkDerivation rec {
pname = "knot-resolver";
version = "5.7.4";
version = "5.7.5";
src = fetchurl {
url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
hash = "sha256-a22m7PBoKAQa+tRN+iJ3gfCuNK0YOmZwCFCTVdGL2cg=";
sha256 = "80239cf9aa92599d9cbad4642dea5520b2ccfbc9c6f968886ea46179cb3cdf66";
};
outputs = [
@@ -67,16 +66,9 @@ let # un-indented, over the whole file
# Even though they should already be loaded and they're in RPATH, too.
for f in daemon/lua/{kres,zonefile}.lua; do
substituteInPlace "$f" \
--replace "ffi.load(" "ffi.load('${lib.getLib knot-dns}/lib/' .. "
--replace-fail "ffi.load(" "ffi.load('${lib.getLib knot-dns}/lib/' .. "
done
''
# https://gitlab.nic.cz/knot/knot-resolver/-/issues/925
+ ''
patch modules/http/meson.build <<EOF
@@ -22 +21,0 @@
- ['http', files('http.test.lua')],
EOF
''
# some tests have issues with network sandboxing, apparently
+ optionalString doInstallCheck ''
echo 'os.exit(77)' > daemon/lua/trust_anchors.test/bootstrap.test.lua