From 4f02d8c6c4661587900fe7d09e81cabed872c363 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 21 May 2019 17:38:18 +0900 Subject: [PATCH 1/5] vimPlugins.LanguageClient-neovim: 0.1.140->0.1.146 Also factorized version so that it needs to be changed in only one location. --- pkgs/misc/vim-plugins/overrides.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 68ec903e613..74bd7d8eeb0 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -43,15 +43,16 @@ self: super: { }; LanguageClient-neovim = let + version = "0.1.146"; LanguageClient-neovim-src = fetchurl { - url = "https://github.com/autozimu/LanguageClient-neovim/archive/0.1.140.tar.gz"; - sha256 = "0cixwm9wnn6vlam6mp57j436n92c4bvj5rs6j2qcv7qip8d2ggyw"; + url = "https://github.com/autozimu/LanguageClient-neovim/archive/${version}.tar.gz"; + sha256 = "1xm98pyzf2dlh04ijjf3nkh37lyqspbbjddkjny1g06xxb4kfxnk"; }; LanguageClient-neovim-bin = rustPlatform.buildRustPackage { name = "LanguageClient-neovim-bin"; src = LanguageClient-neovim-src; - cargoSha256 = "0f591zv4f7spks2hx22nkq78sj42259gi7flnnpr1nfs40d7n13n"; + cargoSha256 = "0dixvmwq611wg2g3rp1n1gqali46904fnhb90gcpl9a1diqb34sh"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. @@ -62,7 +63,7 @@ self: super: { }; in buildVimPluginFrom2Nix { pname = "LanguageClient-neovim"; - version = "0.1.140"; + inherit version; src = LanguageClient-neovim-src; propagatedBuildInputs = [ LanguageClient-neovim-bin ]; From 7ec21fa1625a4522473329c2fc281ea45c66b004 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 21 May 2019 17:40:01 +0900 Subject: [PATCH 2/5] vimPlugins.coc-nvim: init at v0.0.67 you still need to enable the node js provider in your nvim config yarn is optional. Run :checkhealth within neovim if you have any doubt. --- pkgs/misc/vim-plugins/overrides.nix | 18 +++++++++++++++++- pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 74bd7d8eeb0..e48d427d410 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -1,6 +1,6 @@ { lib, stdenv , python, cmake, meson, vim, ruby -, which, fetchgit, fetchurl +, which, fetchgit, fetchurl, fetchzip , llvmPackages, rustPlatform , xkb-switch, fzf, skim, stylish-haskell , python3, boost, icu, ncurses @@ -109,6 +109,22 @@ self: super: { ''; }); + + coc-nvim = let + version = "0.0.67"; + index_js = fetchzip { + url = "https://github.com/neoclide/coc.nvim/releases/download/v${version}/coc.tar.gz"; + sha256 = "0cqgrfyaq9nck1y6mb63gmwgdrxqzgdgns5gjshpp1xzfq6asrqj"; + }; + in super.coc-nvim.overrideAttrs(old: { + # you still need to enable the node js provider in your nvim config + postInstall = '' + mkdir -p $out/share/vim-plugins/coc-nvim/build + cp ${index_js}/index.js $out/share/vim-plugins/coc-nvim/build/ + ''; + + }); + command-t = super.command-t.overrideAttrs(old: { buildInputs = [ ruby rake ]; buildPhase = '' diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 6324064c18f..33946b2fc12 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -215,6 +215,7 @@ ncm2/ncm2-jedi ncm2/ncm2-path ncm2/ncm2-tmux ncm2/ncm2-ultisnips +neoclide/coc.nvim neoclide/vim-easygit neovimhaskell/haskell-vim neovim/nvimdev.nvim From 36411f391b98dcef94907ba7d6407ce9df6b4d37 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 21 May 2019 17:43:00 +0900 Subject: [PATCH 3/5] vimPlugins.vim-lion: init at 2018-02-05 --- pkgs/misc/vim-plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 33946b2fc12..80bc7d29dda 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -306,6 +306,7 @@ thinca/vim-themis thinca/vim-visualstar tomasr/molokai tomlion/vim-solidity +tommcdo/vim-lion tomtom/tlib_vim tpope/vim-abolish tpope/vim-commentary From 31c7852720302eef0c648c4cdd459640004b8506 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 21 May 2019 17:43:59 +0900 Subject: [PATCH 4/5] vimPlugins.nvim-hs-vim: init at 2019-04-14 --- pkgs/misc/vim-plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 80bc7d29dda..bb74107cbd1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -217,6 +217,7 @@ ncm2/ncm2-tmux ncm2/ncm2-ultisnips neoclide/coc.nvim neoclide/vim-easygit +neovimhaskell/nvim-hs.vim neovimhaskell/haskell-vim neovim/nvimdev.nvim neutaaaaan/iosvkem From c67a35d64565152149798e0ee6277d898b732960 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 21 May 2019 17:45:37 +0900 Subject: [PATCH 5/5] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 105 ++++++++++++++++++---------- 1 file changed, 69 insertions(+), 36 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 7e9e49f82de..51abecf6aa1 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-05-16"; + version = "2019-05-20"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "e5ea809094fd1d521ac88516f5b4b6870e656f3a"; - sha256 = "1wq12ycfkkcj70gprzwrp88v0i7jjzf1340mmkhs46wyd5ds82vz"; + rev = "89db85121c001fc60787647f012978a2328816a5"; + sha256 = "0dyb2rmp5mc6rc1a0454jpb322ynr29lj98dddbx9h8jqbkwcz16"; }; }; @@ -235,6 +235,17 @@ let }; }; + coc-nvim = buildVimPluginFrom2Nix { + pname = "coc-nvim"; + version = "2019-05-20"; + src = fetchFromGitHub { + owner = "neoclide"; + repo = "coc.nvim"; + rev = "727982667e568264b512b5dda080f0ce414ed1d3"; + sha256 = "1rh7q0d81mxg7si3ljid5zlskbkifn0fkg4dapj60s33zda8yb0g"; + }; + }; + Colour-Sampler-Pack = buildVimPluginFrom2Nix { pname = "Colour-Sampler-Pack"; version = "2012-11-30"; @@ -505,12 +516,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-05-15"; + version = "2019-05-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "310371d7e0cf123a725dd3f1d1fe02e4919d2d8a"; - sha256 = "15j6hq3ckjmgwr3a2wc43r7kv9bi8ns4x9sg9gn8lwp4c325khfw"; + rev = "0ad6844e7d161e6c989c78197f66eed0924897d8"; + sha256 = "1nfmkg3bccw6f9xlwqz42czmxa8zfk33vkzabj60sbm5s3r7fxrh"; }; }; @@ -549,12 +560,12 @@ let editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2018-11-15"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "68f8136d2b018bfa9b23403e87d3d65bc942cbc3"; - sha256 = "1xnh4b1yf6vgqla4g8vbsvbfkvgx7wzffl5lq7jxwx8rsl0a8nza"; + rev = "37bedf88cabb61d4580295b6e347058df7e7f1b4"; + sha256 = "120fi53qp915qnhaqil15b4n22mp4gp5jvi9yirfmsk88hgz2lab"; fetchSubmodules = true; }; }; @@ -572,12 +583,12 @@ let emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; - version = "2019-04-15"; + version = "2019-05-19"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "ae7d31f29080ad18073dda3530582dacb18475e6"; - sha256 = "0ip4qrbbamdw9rmzh3w29bw9gx8gqlnxgyrdj4z9a1cpxp0cd5k3"; + rev = "758421535f58ab3a4a3dbbbb5e84f1aa7350f8ab"; + sha256 = "01hcmc7jk6dh7yzra5bm7x04rd3909d5p5bd7lwsn3glb21n5007"; fetchSubmodules = true; }; }; @@ -1147,12 +1158,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-05-10"; + version = "2019-05-17"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "787b1bff2a48a85b823abb9d50f8c8553273776a"; - sha256 = "1vdnbplv5spy18azcsn2plcfgnxxbbmr1dca2pfalzgs7bww0la1"; + rev = "9fea982b33627eefbfdf2836458b224bd1c724e4"; + sha256 = "1j9q2h41dpkn9g0j88s0daq0iy7c27xxz0cm5lw5ngpd2y6hnl40"; }; }; @@ -1169,12 +1180,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-05-13"; + version = "2019-05-19"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "786e76cfc1124355f68ff7820439268a0cf9779d"; - sha256 = "02l5rh9n31c8k2vjnm8wx323x21ssg1pxnlhm2svhkpm1qax5q45"; + rev = "45b5d4a8b59f4921ab3fb41db5f0350e64591d69"; + sha256 = "093j0y4zxmh411271i0w5spiwqipw3d0j0f6whkqjn75p65azqj9"; }; }; @@ -1332,14 +1343,25 @@ let }; }; + nvim-hs-vim = buildVimPluginFrom2Nix { + pname = "nvim-hs-vim"; + version = "2019-04-14"; + src = fetchFromGitHub { + owner = "neovimhaskell"; + repo = "nvim-hs.vim"; + rev = "5bc177a87c9575c4995df90a098d330fe6e02f75"; + sha256 = "14jgvkvakpy36md5si2a3rf2w869snb65inriq68xbk32bg5pg8q"; + }; + }; + nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; - version = "2019-05-15"; + version = "2019-05-21"; src = fetchFromGitHub { owner = "roxma"; repo = "nvim-yarp"; - rev = "9eac5b198ad87210a498d4f93344b7450537ab00"; - sha256 = "17y1lcq92dkynjv5hbk3mjnc8g1yg8f19rw1imak7smwx4xjiqv8"; + rev = "8fcb1af27772174df5446d49de29052cac47e46f"; + sha256 = "0ya3xgbnpps6s67rxfwpcfv39micl1d2wblzb7xvs1pmsymwbj0r"; }; }; @@ -1587,12 +1609,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-04-09"; + version = "2019-05-19"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "9984b9753606fe2c8d7f3d4f9d67c1777a967cd6"; - sha256 = "03vn9rxcsrxnr6y0a6nh5ajl804ha98klk1sms61hlkspxib9il9"; + rev = "53f40ec6c628099e353f25cabd54e5047c28d81d"; + sha256 = "162aa8l4wkssxdw5k3nvbzmqacjkdiy882hhi6mr5596a8wg58js"; }; }; @@ -1939,12 +1961,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2019-04-30"; + version = "2019-05-17"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "b68c4fdbd32b7ccf3b4e52e69106021f9bc54878"; - sha256 = "0xikbqljpn3br0pbf8iigp3lc0qwxl4gcj6zg4y5gr8aywll7819"; + rev = "9ab9d12521191e548be2caa6b606d0866ffdf5c5"; + sha256 = "1yjw36lpgr17hwwdhxx20cjrgcpxqymizw45sppjrc1qkm0w4wnm"; }; }; @@ -2698,12 +2720,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-05-16"; + version = "2019-05-20"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "d2f1bbe458d8c7c3154ed113c3768bd84451f872"; - sha256 = "0dcj36vcrbai049bjv8gw6kfd594lny17vvi7c817av6yclmxjqf"; + rev = "3dba44e24526f05ed487d3267a7996bd6b511893"; + sha256 = "1g4bp7bh650kscn94s9yfh7kgy4b9q4bxnf4rzr4zd5ml1458pmx"; }; }; @@ -3049,6 +3071,17 @@ let }; }; + vim-lion = buildVimPluginFrom2Nix { + pname = "vim-lion"; + version = "2018-02-05"; + src = fetchFromGitHub { + owner = "tommcdo"; + repo = "vim-lion"; + rev = "75306ac1922952ca1a401aee43ddbb304029926d"; + sha256 = "0kkf91ppn5jhvnpmmjsp6rvf97pqj57jrbn3qmmy925ncfqh90ld"; + }; + }; + vim-liquid = buildVimPluginFrom2Nix { pname = "vim-liquid"; version = "2016-02-11"; @@ -3755,12 +3788,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-05-14"; + version = "2019-05-20"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "d98d657d29691118b2ac830ca876f297d8567800"; - sha256 = "1hhr3d8z9mfhylwx6vj49hs3b54hrhkipy67si5mds38g92rqfhg"; + rev = "ebe0344bb7a446f7ae654caa057a07b90dfbd03f"; + sha256 = "0d5a57l7yl1l272adajnqy3frqrnbhlw810klay7dwkqk4s7psvl"; }; }; @@ -4019,12 +4052,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-05-14"; + version = "2019-05-19"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "26de8b92c9e9f2428f27d241cab1e7e15af56d3a"; - sha256 = "0zvj6f02x3gf3qpv877n01yxyi7hqk5gczw0z3m7x3yz81xpv1m1"; + rev = "596a0fdbf44b6262867492b2f3f76c5e0cadc2e0"; + sha256 = "0ndrc1svm7z3zhkrndjsv17pimms2arb8pagsgavf7cjixn9n6ji"; }; };