Merge branch 'master' into staging

* master: (33 commits)
  Revert "libxml2: add static output"
  yq: 2.5.0 -> 2.6.0 (#41926)
  yoshimi: 1.5.8 -> 1.5.8.2 (#41925)
  haskell generic-builder: Use separate setup db in more cases
  nixos/tests/morty: fix non-deterministic failure
  texlive: Fix 'match-parens' ruby dependency
  chromium: 67.0.3396.62 -> 67.0.3396.87
  ngspice: Fix regression due to missing X libs (#41890)
  mattermost-desktop: init at 4.1.1 (#40794)
  xcircuit: init at 3.9.73 (#41891)
  yarn: 1.7.0 -> 1.8.0 (#41895)
  Update default.nix (#41842)
  libxml2: add static output
  remarshal: supports darwin
  go-ethereum: 1.8.10 -> 1.8.11
  bazel: add darwin support
  llvm: use native cmake for libc++abi
  kicad-unstable: 2018-03-10 -> 2018-06-12
  cmake: Only apply application-services.patch with 3.11
  nixos/tinc: minor fixes
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
index 20c9eecb0d5f..c34edfb5d6f8 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     # cannot find postgresql libs on macos x
     license = licenses.gpl2;
-    maintainers = [ maintainers.mic92 ];
+    maintainers = with maintainers; [ mic92 disassembler ];
   };
 }