diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-05-06 16:27:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-05-06 16:27:57 +0200 |
| commit | c84e5f8e1fc6c34e68b376397bb449622ed7a45c (patch) | |
| tree | bee486c1336cadcb4bb4f25e00747cad9f13f711 /pkgs | |
| parent | 46e402fc6e4c403f29d793bdda5d5ed4313bcf69 (diff) | |
| parent | 9791289e848f4b48497fbaa955eb49abbdc0f1b1 (diff) | |
Merge #170909: knot-resolver: minor improvements
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/dns/knot-resolver/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index d47b5a3e6a3c..1ec5a78ea1a2 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -55,7 +55,7 @@ unwrapped = stdenv.mkDerivation rec { # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] - ++ optionals stdenv.isLinux [ systemd libcap_ng ] + ++ optionals stdenv.isLinux [ /*lib*/systemd libcap_ng ] ++ [ nghttp2 ] ## optional dependencies; TODO: dnstap ; @@ -79,8 +79,7 @@ unwrapped = stdenv.mkDerivation rec { rm -r "$out"/lib/sysusers.d/ # ATM more likely to harm than help ''; - doInstallCheck = with stdenv; hostPlatform == buildPlatform - && !(isDarwin && isAarch64); # avoid luarocks, as it's broken ATM on the platform + doInstallCheck = with stdenv; hostPlatform == buildPlatform; installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ]; installCheckPhase = '' meson test --print-errorlogs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26e8d7120e6a..4dc3708603e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21862,7 +21862,9 @@ with pkgs; keycloak = callPackage ../servers/keycloak { }; knot-dns = callPackage ../servers/dns/knot-dns { }; - knot-resolver = callPackage ../servers/dns/knot-resolver { }; + knot-resolver = callPackage ../servers/dns/knot-resolver { + systemd = systemdMinimal; # in closure already anyway + }; rdkafka = callPackage ../development/libraries/rdkafka { }; |