diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2021-03-19 18:17:01 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2021-03-19 18:17:01 +0100 |
| commit | 1ecb97eae93f6ea120ead7628da87c570f8074e2 (patch) | |
| tree | 3baad8d9af311a012d0d7a0dba9604d0462acc7c /pkgs/misc | |
| parent | c804f22a81bb70bc8a82939dbfc8388dfe22c0c2 (diff) | |
| parent | fe7df3f3ff76fca22c4eefa0ce53eb9f6b1f64a2 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/vim-plugins/generated.nix | 12 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/vim-plugin-names | 1 | ||||
| -rw-r--r-- | pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 08d76932f025..810622cfe8e1 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2926,6 +2926,18 @@ let meta.homepage = "https://github.com/tjdevries/nlua.nvim/"; }; + nnn-vim = buildVimPluginFrom2Nix { + pname = "nnn-vim"; + version = "2021-02-28"; + src = fetchFromGitHub { + owner = "mcchrish"; + repo = "nnn.vim"; + rev = "edfc91e1189a36a5f0d5438d7f9c575571f759fa"; + sha256 = "11dzqhd2kp537ig8zcny0j56644mmrgygiw3wvfh1ly9gb9l2r9f"; + }; + meta.homepage = "https://github.com/mcchrish/nnn.vim/"; + }; + nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; version = "2020-07-06"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a8d58da8efa4..b37679f896ba 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -345,6 +345,7 @@ maximbaz/lightline-ale MaxMEllon/vim-jsx-pretty mbbill/undotree mboughaba/i3config.vim +mcchrish/nnn.vim megaannum/forms megaannum/self mengelbrecht/lightline-bufferline diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix index e8e8ead9dbde..836b9cc2a2b9 100644 --- a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix @@ -38,8 +38,8 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens mktplcRef = { name = "vsliveshare"; publisher = "ms-vsliveshare"; - version = "1.0.3912"; - sha256 = "1k5yy04q85jjr7hzrv0s7x1m2251kglb038wcvvbs568vpscghi8"; + version = "1.0.3968"; + sha256 = "1nmhkxrlg9blxcqh7a3hl0wc5mkk2p77mn228lvmcirpbk3acsx5"; }; }).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ |