Merge master into staging-next

2021-05-19 00:55:36 +00:00
parent abbbeaf42a 4e211c1b09
commit 7000ae2b9a
49 changed files with 626 additions and 171 deletions
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -25,7 +25,7 @@ let
    inherit llvmPackages;
  };

-  aliases = if (config.allowAliases or true) then final: prev: {} else (import ./aliases.nix lib);
+  aliases = if (config.allowAliases or true) then (import ./aliases.nix lib) else final: prev: {};

  extensible-self = lib.makeExtensible
    (extends aliases