Merge master into staging-next

2021-01-07 18:40:50 +00:00
parent a544214cae d80ba82f2e
commit 5c072a088d
37 changed files with 459 additions and 191 deletions
--- a/pkgs/servers/sql/patroni/default.nix
+++ b/pkgs/servers/sql/patroni/default.nix
@@ -52,6 +52,6 @@ pythonPackages.buildPythonApplication rec {
    description = "A Template for PostgreSQL HA with ZooKeeper, etcd or Consul";
    license = licenses.mit;
    platforms = platforms.linux;
-    maintainers = [ maintainers.limeytexan ];
+    maintainers = teams.deshaw.members;
  };
 }