Merge branch 'staging-next'

Security fixes for a few packages are included.
2018-08-21 15:36:02 +02:00
parent 690a8017de cad8fc3447
commit 765d695b89
196 changed files with 9556 additions and 16487 deletions
@@ -27,11 +27,12 @@ unwrapped = stdenv.mkDerivation rec {

  # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
  buildInputs = [ knot-dns luajit libuv gnutls nettle lmdb ]
-    ++ optional doCheck cmocka
    ++ optional stdenv.isLinux systemd # sd_notify
    ## optional dependencies; TODO: libedit, dnstap
    ;

+  checkInputs = [ cmocka ];
+
  makeFlags = [
    "PREFIX=$(out)"
    "ROOTHINTS=${dns-root-data}/root.hints"
@@ -84,4 +85,3 @@ wrapped-full = with luajitPackages; let
  '';

 in result
-