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/graphics/agi/default.nix

@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "agi";
-  version = "1.1.0-dev-20210430";
+  version = "1.1.0-dev-20210504";
 
   src = fetchzip {
     url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip";
-    sha256 = "sha256-Sb2N3GPS+A55O39/kqua7M18O1F76zz6sNFghSFRBmk=";
+    sha256 = "sha256-q9xWe1gGX7SV/tAUHu/uBB709aqegIsNLTPM5zljgYY=";
   };
 
   nativeBuildInputs = [

pkgs/tools/graphics/perceptualdiff/default.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A program that compares two images using a perceptually based image metric";
     homepage = "https://github.com/myint/perceptualdiff";
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ uri-canva ];
     platforms = platforms.x86;
   };