Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-02-01 12:24:36 +00:00
committed by GitHub
40 changed files with 951 additions and 121 deletions
+9 -2
View File
@@ -297,8 +297,11 @@ self: super: {
});
sql-nvim = super.sql-nvim.overrideAttrs(old: {
buildInputs = [ sqlite ];
});
postPatch = ''
substituteInPlace lua/sql/defs.lua \
--replace "vim.g.sql_clib_path or" "vim.g.sql_clib_path or '${sqlite.out}/lib/libsqlite3.so' or"
'';
});
sved = let
# we put the script in its own derivation to benefit the magic of wrapGAppsHook
@@ -687,6 +690,10 @@ self: super: {
'';
});
telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs(old: {
dependencies = [ self.sql-nvim ];
});
telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: {
preFixup =
let