Merge master into staging-next

2021-03-10 12:21:24 +00:00
parent 90a20b5f9b 86ee8dd8ff
commit aea4725648
31 changed files with 308 additions and 81 deletions
@@ -656,7 +656,7 @@ self: super: {
  });

  lf-vim = super.lf-vim.overrideAttrs (old: {
-    dependencies = with super; [ vim-bbye ];
+    dependencies = with super; [ vim-floaterm ];
  });

  vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: {