Merge staging-next into staging

2020-06-24 19:04:26 +02:00
parent fa54dd346f 16287a8cb8
commit 6f72f0b0df
154 changed files with 1609 additions and 808 deletions
@@ -554,6 +554,10 @@ self: super: {
    dependencies = with super; [ vim-maktaba ];
  });

+  vim-beancount = super.vim-beancount.overrideAttrs(old: {
+    passthru.python3Dependencies = ps: with ps; [ beancount ];
+  });
+
  vim-codefmt = super.vim-codefmt.overrideAttrs(old: {
    dependencies = with super; [ vim-maktaba ];
  });