Merge master into staging-next

2021-03-09 00:39:09 +00:00
parent 3521dc45ed 909cd83cb2
commit 3db2dee35f
65 changed files with 2594 additions and 1218 deletions
--- a/pkgs/misc/vscode-extensions/default.nix
+++ b/pkgs/misc/vscode-extensions/default.nix
@@ -365,8 +365,8 @@ let
        mktplcRef = {
          name = "todo-tree";
          publisher = "Gruntfuggly";
-          version = "0.0.198";
-          sha256 = "0riy2k8dbsnpk8vkv814fr8zh87y425s24nklcx4b7mfrszv7xbn";
+          version = "0.0.201";
+          sha256 = "1hjck1r2byc45rp28gn15wbmcrl1wjng7kn5lyhr6mgjjwqh5pa8";
        };
        meta = with lib; {
          license = licenses.mit;