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/development/interpreters/erlang/R18.nix

@@ -1,14 +1,14 @@
-{ mkDerivation, fetchurl }:
+{ mkDerivation, fetchpatch }:
 
 let
-  rmAndPwdPatch = fetchurl {
+  rmAndPwdPatch = fetchpatch {
      url = "https://github.com/erlang/otp/commit/98b8650d22e94a5ff839170833f691294f6276d0.patch";
-     sha256 = "0cd5pkqrigiqz6cyma5irqwzn0bi17k371k9vlg8ir31h3zmqfip";
+     sha256 = "0zjs7as83prgq4d5gaw2cmnajnsprdk8cjl5kklknx0pc2b3hfg5";
   };
 
-  envAndCpPatch = fetchurl {
+  envAndCpPatch = fetchpatch {
      url = "https://github.com/erlang/otp/commit/9f9841eb7327c9fe73e84e197fd2965a97b639cf.patch";
-     sha256 = "10h5348p6g279b4q01i5jdqlljww5chcvrx5b4b0dv79pk0p0m9f";
+     sha256 = "00fx5wc88ki3z71z5q4xzi9h3whhjw1zblpn09w995ygn07m9qhm";
   };
 
 in mkDerivation rec {

pkgs/development/interpreters/spidermonkey/31.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   # probably it would be more ideal to pull a particular tag/revision
   # from the mercurial repo
   src = fetchurl {
-    url = "https://people.mozilla.org/~sstangl/mozjs-31.5.0.tar.bz2";
+    url = "https://people.freebsd.org/~sunpoet/sunpoet/mozjs-31.5.0.tar.bz2";
     sha256 = "1q8icql5hh1g3gzg5fp4rl9rfagyhm9gilfn3dgi7qn4i1mrfqsd";
   };
 

pkgs/development/interpreters/spidermonkey/38.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   # probably it would be more ideal to pull a particular tag/revision
   # from the mercurial repo
   src = fetchurl {
-    url = "https://people.mozilla.org/~sstangl/mozjs-${version}.tar.bz2";
+    url = "https://people.freebsd.org/~sunpoet/sunpoet/mozjs-${version}.tar.bz2";
     sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681";
   };