Merge master into staging-next

This brings thousands of rebuilds. Hydra nixpkgs: ?compare=1597944
2020-07-04 09:10:10 +02:00
parent deb78151a9 9f93642b79
commit e1206a2129
160 changed files with 4236 additions and 2376 deletions
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -57,6 +57,7 @@ cloudhead/neovim-fuzzy
 CoatiSoftware/vim-sourcetrail
 cocopon/iceberg.vim
 cohama/lexima.vim
+crusoexia/vim-monokai
 ctjhoa/spacevim
 ctrlpvim/ctrlp.vim
 dag/vim-fish