Merge branch 'master' into staging

* master: (63 commits)
  tests.cc-wrapper: do not test sanitizers on darwin
  nodePackages_8_x: Add nodejs (npm) to wrapper
  python.pkgs.cairocffi: support darwin
  osinfo-db: 20180514 -> 20180531 (#41532)
  pkcs11helper: 1.22 -> 1.23 (#41530)
  pmd: 6.3.0 -> 6.4.0 (#41529)
  renpy: 6.99.14.3 -> 7.0.0 (#41515)
  wireless-regdb: 2018.05.09 -> 2018.05.31 (#41502)
  gnuplot: 5.2.3 -> 5.2.4 (#41505)
  qrencode: 4.0.0 -> 4.0.1
  Revert "libbsd: replace with nbcompat"
  Revert "opendkim: fix libbsd dependency"
  Revert "libbsd-freedesktop: re-init at 0.9.1, use for samba"
  flent: fix fetchFromGitHub version
  syncthing: 0.14.47 -> 0.14.48
  pythonPackages.pykdtree: init at 1.3.0 (#41355)
  snd: 18.3 -> 18.4
  bat: support darwin
  faust2: fix build with llvm 5.0.2 (#40672)
  mc: 4.8.20 -> 4.8.21 (#41496)
  ...

doc/Makefile

@@ -12,6 +12,11 @@ format:
 	find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \
 		xmlformat --config-file "$$XMLFORMAT_CONFIG" -i {}
 
+.PHONY: fix-misc-xml
+fix-misc-xml:
+	find . -iname '*.xml' -type f \
+		-exec ../nixos/doc/varlistentry-fixer.rb {} ';'
+
 .PHONY: clean
 clean:
 	rm -f ${MD_TARGETS} .version manual-full.xml