Merge branch 'staging-next' into staging

The transmission conflict was non-trivial:
- libbrotli added to apparmor rules <https://github.com/NixOS/nixpkgs/commit/1bdda029cd85b5f4358697afd2c8f6a1996c6ccf>
- apparmor rules rewritten <https://github.com/NixOS/nixpkgs/commit/b280e64078d69c59cf4fccfcaa9d56a59d789dc9>

Chosen the rewrite and verified that brotli is part of the rule set generated by `apparmorRulesFromClosure`.

pkgs/tools/networking/burpsuite/default.nix

@@ -2,12 +2,15 @@
 
 stdenv.mkDerivation rec {
   pname = "burpsuite";
-  version = "2020.12.1";
+  version = "2021.4.2";
 
   src = fetchurl {
     name = "burpsuite.jar";
-    url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar";
-    sha256 = "AcoPyVXUf2YGfX2/GbtGZeQ4P7zSsYFb9L57trXive0=";
+    urls = [
+      "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"
+      "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"
+    ];
+    sha256 = "034c9d0a7e0b5e7b1b286949c6b31b475ff2a15e75f1230ccc07e236fc61d2aa";
   };
 
   dontUnpack = true;

pkgs/tools/networking/dnsproxy/default.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "dnsproxy";
-  version = "0.37.2";
+  version = "0.37.3";
 
   src = fetchFromGitHub {
     owner = "AdguardTeam";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-pzE0nhL6Dqa9AfB2EGxETOo+BnTzzPnu8ANfbu1vfyI=";
+    sha256 = "sha256-8lZDWvd5Lq8uHBt47gRhg0MLeJ5iRheMBUjkfaJueDI=";
   };
 
   vendorSha256 = null;