Merge staging-next into staging

2021-01-04 12:26:43 +00:00
parent b6af78fdf5 89699cbe21
commit f0187a2cf3
18 changed files with 179 additions and 48 deletions
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation {
    "--with-tcsetpgrp"
    "--enable-pcre"
    "--enable-zprofile=${placeholder "out"}/etc/zprofile"
+    "--disable-site-fndir"
  ];

  # the zsh/zpty module is not available on hydra