Merge remote-tracking branch 'origin/master' into staging-next

Conflicts: pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
parent 563389a7fd 6543c61311
commit 11a9ac00fc
157 changed files with 1479 additions and 591 deletions
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
    description = "Infinitely extensible web-browser (with Lisp development files using WebKitGTK platform port)";
    homepage = "https://nyxt.atlas.engineer";
    license = licenses.bsd3;
-    maintainers = with maintainers; [ lewo ];
+    maintainers = with maintainers; [ lewo payas ];
    platforms = platforms.all;
  };
 }