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

Conflicts: pkgs/applications/terminal-emulators/alacritty/default.nix pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
parent 24f13758b9 8aac6d8daf
commit 14f3686af1
120 changed files with 7535 additions and 2303 deletions
@@ -24,6 +24,8 @@ buildPythonApplication rec {
    ./homeserver-script.patch
  ];

+  buildInputs = [ openssl ];
+
  propagatedBuildInputs = [
    setuptools
    bcrypt