Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 47b02b30e32a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9a38c3a11b8d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 18, 2020

  1. knot-resolver: fix evaluation on darwin 

    I somehow forgot that libcap_ng is linux-only.  I'm missing ofborg's
darwin builder, but I might've tested evaluation at least...
    @vcunat
    vcunat committed Nov 18, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9a38c3a View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/servers/dns/knot-resolver/default.nix
10 changes: 5 additions & 5 deletions pkgs/servers/dns/knot-resolver/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@
# native deps.
, runCommand, pkgconfig, meson, ninja, makeWrapper
# build+runtime deps.
, knot-dns, luajitPackages, libuv, gnutls, lmdb, systemd, dns-root-data
, nghttp2, libcap_ng # optionals, in principle
, knot-dns, luajitPackages, libuv, gnutls, lmdb
, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle
# test-only deps.
, cmocka, which, cacert
, extraFeatures ? false /* catch-all if defaults aren't enough */
@@ -54,9 +54,9 @@ unwrapped = stdenv.mkDerivation rec {

# http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ]
++ optional stdenv.isLinux systemd # passing sockets, sd_notify
++ [ nghttp2 libcap_ng ]
## optional dependencies; TODO: libedit, dnstap
++ optionals stdenv.isLinux [ systemd libcap_ng ]
++ [ nghttp2 ]
## optional dependencies; TODO: dnstap
;

mesonFlags = [