nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

knot-resolver: run more tests also on *-darwin

Browse Source 
The tests need patching a bit, until the next release.
These tests would e.g. discover that kresd didn't work at all
until the patch in the parent commit.
This commit is contained in:
Vladimír Čunát 2022-08-24 18:15:12 +02:00
parent 6d2168c73c
commit 6ffee2b5d0
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
{ lib, stdenv, fetchurl
, fetchpatch
# native deps.
, runCommand, pkg-config, meson, ninja, makeWrapper
# build+runtime deps.
@ -26,6 +27,19 @@ unwrapped = stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
patches = [
(fetchpatch {
name = "fix-config-tests-on-darwin.patch";
url = "https://gitlab.nic.cz/knot/knot-resolver/-/commit/48ad9d436cf80f58c107774c313a561d852148a0.diff";
sha256 = "CEX1XkeYLUSe31xUhNdMRMl1VUXtKFCs5noNJaqL5x0=";
})
(fetchpatch {
name = "fix-config-tests-on-aarch64-darwin.patch";
url = "https://gitlab.nic.cz/knot/knot-resolver/-/commit/adaac913c50a5db2f226a081ddc419b0d56d1757.diff";
sha256 = "1LrL74luzPTyJ7VBi7fskDga4lYAh7cSUmDcd1BNO78=";
})
];
# Path fixups for the NixOS service.
postPatch = ''
patch meson.build <<EOF
@ -74,7 +88,7 @@ unwrapped = stdenv.mkDerivation rec {
"--default-library=static" # not used by anyone
]
++ optional doInstallCheck "-Dunit_tests=enabled"
++ optional (doInstallCheck && !stdenv.isDarwin) "-Dconfig_tests=enabled"
++ optional doInstallCheck "-Dconfig_tests=enabled"
++ optional stdenv.isLinux "-Dsystemd_files=enabled" # used by NixOS service
#"-Dextra_tests=enabled" # not suitable as in-distro tests; many deps, too.
;