Merge branch 'master' into staging

* master: (28 commits)
  go_1_9: skip flaky TestWaitGroupMisuse2
  erlangR18: fix patch hashes with fetchpatch
  xml2: replace dead links
  nixos/pam: fix docs about path to u2f_keys file
  cinelerra: add a note about parallel building
  msmtp: install docs and examples (#31769)
  kernel: Fix out-of-tree modules on aarch64
  nixos/tests/acme: update terms of service to fix test
  gixy: init at 0.1.8
  pythonPackages.ConfigArgParse: 0.9.3 -> 0.12.0, refactor, move to python-modules
  mono: init at 4.8
  wal-g: fix license so not to break evaluation
  wal-g: init at 0.1.2
  maintainers: add backuitist
  nixos/prometheus: Correct documentation for external_labels
  spidermonkey: replace broken links
  vagrant: removed custom rake gem
  vagrant: 2.0.0 -> 2.0.1
  nixos/prometheus: add external_labels option
  nixos/prometheus: add scrape_configs.honor_labels
  ...

pkgs/servers/tvheadend/default.nix

@@ -3,7 +3,7 @@
 , which, zlib }:
 
 let
-  version = "4.2.1";
+  version = "4.2.4";
 
 in stdenv.mkDerivation rec {
   name = "tvheadend-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
     owner  = "tvheadend";
     repo   = "tvheadend";
     rev    = "v${version}";
-    sha256 = "1lhk8psvifmn4kjwyfxjj21z0apyr59zizzsfd4j22v7bk66rrl9";
+    sha256 = "1kydjmgv0nrllgi2s6aczq4x9ag01c8qm8w962qb52fzdfw7fs6k";
   };
 
   buildInputs = [
@@ -39,7 +39,8 @@ in stdenv.mkDerivation rec {
   preConfigure = ''
     patchShebangs ./configure
 
-    substituteInPlace src/config.c --replace /usr/bin/tar ${gnutar}/bin/tar
+    substituteInPlace src/config.c \
+      --replace /usr/bin/tar ${gnutar}/bin/tar
 
     # the version detection script `support/version` reads this file if it
     # exists, so let's just use that