cabaf93 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge pull request #160336 from AndersonTorres/move-editor-plugins

Move misc/vim-plugins to applications/editors/vim/plugins

commitcabaf93f48a67bc8c29f508e23a1725469fb46da authorAnderson Torres <torres.anderson.85@protonmail.com> dateThu 24 Feb 2022, 22:40 (5 years ago) parent34a99f4 dd88285

31 files changed+179−146

compare with master

unifiedsplit

.github/CODEOWNERS+1−1

@@ -226,7 +226,7 @@

226226/pkgs/applications/editors/neovim @jonringer @teto

227227

228228# VimPlugins

229−/pkgs/misc/vim-plugins @jonringer @softinio

229+/pkgs/applications/editors/vim/plugins @jonringer

230230

231231# VsCode Extensions

232232/pkgs/applications/editors/vscode/extensions @jonringer

.github/labeler.yml+1−1

@@ -142,7 +142,7 @@

142142"6.topic: vim":

143143 - doc/languages-frameworks/vim.section.md

144144 - pkgs/applications/editors/vim/**/*

145− - pkgs/misc/vim-plugins/**/*

145+ - pkgs/applications/editors/vim/plugins/**/*

146146 - nixos/modules/programs/neovim.nix

147147 - pkgs/applications/editors/neovim/**/*

148148

doc/contributing/submitting-changes.chapter.md+1−1

@@ -98,7 +98,7 @@ We use jbidwatcher as an example for a discontinued project here.

98981. Create a new branch for your change, e.g. `git checkout -b jbidwatcher`

99991. Remove the actual package including its directory, e.g. `rm -rf pkgs/applications/misc/jbidwatcher`

1001001. Remove the package from the list of all packages (`pkgs/top-level/all-packages.nix`).

101−1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/misc/vim-plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.)

101+1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/applications/editors/vim/plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.)

102102

103103 For example in this case:

104104

doc/languages-frameworks/vim.section.md+4−4

@@ -309,9 +309,9 @@ Sample output2:

309309

310310## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs}

311311

312−Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`.

312+Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`.

313313

314−Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added:

314+Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added:

315315

316316```nix

317317deoplete-fish = super.deoplete-fish.overrideAttrs(old: {

@@ -330,13 +330,13 @@ Finally, there are some plugins that are also packaged in nodePackages because t

330330Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token).

331331

332332```sh

333−GITHUB_API_TOKEN=my_token ./pkgs/misc/vim-plugins/update.py

333+GITHUB_API_TOKEN=my_token ./pkgs/applications/editors/vim/plugins/update.py

334334```

335335

336336Alternatively, set the number of processes to a lower count to avoid rate-limiting.

337337

338338```sh

339−./pkgs/misc/vim-plugins/update.py --proc 1

339+./pkgs/applications/editors/vim/plugins/update.py --proc 1

340340```

341341

342342## Important repositories {#important-repositories}

maintainers/scripts/pluginupdate.py+1−1

@@ -1,4 +1,4 @@

1−# Used by pkgs/misc/vim-plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py

1+# Used by pkgs/applications/editors/vim/plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py

33# format:

44# $ nix run nixpkgs.python3Packages.black -c black update.py

pkgs/misc/vim-plugins/aliases.nix → pkgs/applications/editors/vim/plugins/aliases.nixrenamed

The content is the same.

pkgs/misc/vim-plugins/build-vim-plugin.nix → pkgs/applications/editors/vim/plugins/build-vim-plugin.nixrenamed

The content is the same.

pkgs/misc/vim-plugins/default.nix → pkgs/applications/editors/vim/plugins/default.nixrenamed

The content is the same.

pkgs/misc/vim-plugins/deprecated.json → pkgs/applications/editors/vim/plugins/deprecated.jsonrenamed

The content is the same.

pkgs/misc/vim-plugins/generated.nix → pkgs/applications/editors/vim/plugins/generated.nixrenamed+148−124

@@ -1,4 +1,4 @@

1−# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!

1+# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!

22{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }:

44final: prev:

@@ -41,12 +41,12 @@ final: prev:

4141

4242 aerial-nvim = buildVimPluginFrom2Nix {

4343 pname = "aerial.nvim";

44− version = "2022-02-21";

44+ version = "2022-02-22";

4545 src = fetchFromGitHub {

4646 owner = "stevearc";

4747 repo = "aerial.nvim";

48− rev = "f4dab432cb3afe0b737f85d823fcd74655727aae";

49− sha256 = "0i1qmfnlcwa3d75s4b07yn62737fz87w3jgsjpf5ijmkyxf29d1k";

48+ rev = "37802e72263f1592575ec1133969890b703e70a7";

49+ sha256 = "085ln5pv5yk9kxhnvizyy2rm67nlhkmw4m92pg3yakjhx8cxmh1w";

5050 };

5151 meta.homepage = "https://github.com/stevearc/aerial.nvim/";

5252 };

@@ -461,12 +461,12 @@ final: prev:

461461

462462 bufferline-nvim = buildVimPluginFrom2Nix {

463463 pname = "bufferline.nvim";

464− version = "2022-02-15";

464+ version = "2022-02-24";

465465 src = fetchFromGitHub {

466466 owner = "akinsho";

467467 repo = "bufferline.nvim";

468− rev = "e97a404bd7449ecebab243c796c1016c98397fc0";

469− sha256 = "1cfqcbxvig271zppq0mydj616dgbdy5ryvycc64q5gyq1lfmhnsl";

468+ rev = "871495d9e2dbe3314a421fd2d5e46f47de7ee537";

469+ sha256 = "1xw13g6l16i6k32f3mdzmihz0m0n9y586ykiynjwkil69wxpjd1l";

470470 };

471471 meta.homepage = "https://github.com/akinsho/bufferline.nvim/";

472472 };

@@ -533,12 +533,12 @@ final: prev:

533533

534534 chadtree = buildVimPluginFrom2Nix {

535535 pname = "chadtree";

536− version = "2022-02-22";

536+ version = "2022-02-24";

537537 src = fetchFromGitHub {

538538 owner = "ms-jpq";

539539 repo = "chadtree";

540− rev = "45177b39245b6aa4efda9f5051aadaad6f953fd5";

541− sha256 = "0hgmkfrwwplzw6bsvvd9549rr3326k4bviix8w4ir133qw8av5j5";

540+ rev = "169134de0d3919837a436cceb806ce8e29a239ea";

541+ sha256 = "1qfg5k406qdxv534c3xbrhpjhigsxkgj9yqm0sx45z5l6f4cmih6";

542542 };

543543 meta.homepage = "https://github.com/ms-jpq/chadtree/";

544544 };

@@ -641,12 +641,12 @@ final: prev:

641641

642642 cmd-parser-nvim = buildVimPluginFrom2Nix {

643643 pname = "cmd-parser.nvim";

644− version = "2021-05-30";

644+ version = "2022-02-23";

645645 src = fetchFromGitHub {

646646 owner = "winston0410";

647647 repo = "cmd-parser.nvim";

648− rev = "70813af493398217cb1df10950ae8b99c58422db";

649− sha256 = "0rfa8cpykarcal8qcfp1dax1kgcbq7bv1ld6r1ia08n9vnqi5vm6";

648+ rev = "6363b8bddef968c3ec51a38172af44f675f01ef3";

649+ sha256 = "11vi9fwgbcvrb8jnicsnwmggayn0586glfdknlkg43smz2cay3f1";

650650 };

651651 meta.homepage = "https://github.com/winston0410/cmd-parser.nvim/";

652652 };

@@ -965,12 +965,12 @@ final: prev:

965965

966966 coc-nvim = buildVimPluginFrom2Nix {

967967 pname = "coc.nvim";

968− version = "2022-02-19";

968+ version = "2022-02-24";

969969 src = fetchFromGitHub {

970970 owner = "neoclide";

971971 repo = "coc.nvim";

972− rev = "33ddba0d8db509378b59d05939da20d8a8d23df7";

973− sha256 = "0vqdv9yscjp7m9p61qwb0jgrdxkj9c5fbw3ccy5z158lnfa4j5hk";

972+ rev = "1bdaaefc15baea37f4de1f8bedb5b3dd7c0efd32";

973+ sha256 = "1vjwgbw9r4jd41nkxmkn3yxdmds1alf9gf96kv0jdxjdxryy23dc";

974974 };

975975 meta.homepage = "https://github.com/neoclide/coc.nvim/";

976976 };

@@ -989,12 +989,12 @@ final: prev:

989989

990990 colorbuddy-nvim = buildVimPluginFrom2Nix {

991991 pname = "colorbuddy.nvim";

992− version = "2021-12-01";

992+ version = "2022-02-22";

993993 src = fetchFromGitHub {

994994 owner = "tjdevries";

995995 repo = "colorbuddy.nvim";

996− rev = "c678edd8113274574f9d9ef440773d1123e1431d";

997− sha256 = "095347cz5idcb09l4sl236agzi89lyr9r40nix2c8vk5pbskvp8f";

996+ rev = "e0f5fafb4ee06cb29a915f8128282fc1f99b128f";

997+ sha256 = "1lfb6ynhjyxzsm6id720f07cc1f52g38mzfc1i0hi4mysjnrkfh3";

998998 };

999999 meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/";

10001000 };

@@ -1230,24 +1230,24 @@ final: prev:

12301230

12311231 coq_nvim = buildVimPluginFrom2Nix {

12321232 pname = "coq_nvim";

1233− version = "2022-02-22";

1233+ version = "2022-02-24";

12341234 src = fetchFromGitHub {

12351235 owner = "ms-jpq";

12361236 repo = "coq_nvim";

1237− rev = "baad617cc9d9598c563d0571d44ef226d4888ee7";

1238− sha256 = "0a7yfmqrsbq4x5k0vvjlvw89n3k3hwsbz72cgcazid7a1ngxwh37";

1237+ rev = "6e2e12b2485a03a5f5a62319c6ae638b32a203d8";

1238+ sha256 = "08bwgn1vvsr96p7ifzc6qxhjdldfgxcqjha7jljrpbqjwj9cfdij";

12391239 };

12401240 meta.homepage = "https://github.com/ms-jpq/coq_nvim/";

12411241 };

12421242

12431243 Coqtail = buildVimPluginFrom2Nix {

12441244 pname = "Coqtail";

1245− version = "2022-02-21";

1245+ version = "2022-02-22";

12461246 src = fetchFromGitHub {

12471247 owner = "whonore";

12481248 repo = "Coqtail";

1249− rev = "877cd4b9b023d728d196d7841ceec47d2060c467";

1250− sha256 = "0qr8zvscwms6w0w4pfzdx319nykiacgj7qvgzk9ip5jfwnnlrxwr";

1249+ rev = "3526cb195cb381cef5d4fc25c532f00942562874";

1250+ sha256 = "0jxbdcjkmfwi05g1xdibr0i24hq23ihslmhpbj4yy0hj1x7afdk2";

12511251 };

12521252 meta.homepage = "https://github.com/whonore/Coqtail/";

12531253 };

@@ -1832,12 +1832,12 @@ final: prev:

18321832

18331833 edge = buildVimPluginFrom2Nix {

18341834 pname = "edge";

1835− version = "2022-02-20";

1835+ version = "2022-02-24";

18361836 src = fetchFromGitHub {

18371837 owner = "sainnhe";

18381838 repo = "edge";

1839− rev = "205cbbdd1181c3d164a84568449904fd1fe270a5";

1840− sha256 = "1rjwdl4wiv49cr0wrm9ivy21r5cwif5p6ci2yhbsa048bg1gimpc";

1839+ rev = "032c406c7f63874c459234beedf8452d2fa38ee4";

1840+ sha256 = "1qjv2zs07svnw5whs2lsznxpbffr03i95n8q6xipqndzya7g23ym";

18411841 };

18421842 meta.homepage = "https://github.com/sainnhe/edge/";

18431843 };

@@ -2267,12 +2267,12 @@ final: prev:

22672267

22682268 gentoo-syntax = buildVimPluginFrom2Nix {

22692269 pname = "gentoo-syntax";

2270− version = "2022-02-21";

2270+ version = "2022-02-23";

22712271 src = fetchFromGitHub {

22722272 owner = "gentoo";

22732273 repo = "gentoo-syntax";

2274− rev = "e5a55b7fa046e3b23b7f7e5e2224fa9dc74c1052";

2275− sha256 = "1l83d2yj8qd1vgc5iqswqim43akf31pm6apgi4y9fsg22lb742ip";

2274+ rev = "cf5f268f8b19262515105739bdcc112cd2a6cdbc";

2275+ sha256 = "1pbvr1yirn17fxw8zlzp8j5brj0n2sdm3ampjryirdxknli93685";

22762276 };

22772277 meta.homepage = "https://github.com/gentoo/gentoo-syntax/";

22782278 };

@@ -3228,12 +3228,12 @@ final: prev:

32283228

32293229 lightspeed-nvim = buildVimPluginFrom2Nix {

32303230 pname = "lightspeed.nvim";

3231− version = "2022-02-18";

3231+ version = "2022-02-24";

32323232 src = fetchFromGitHub {

32333233 owner = "ggandor";

32343234 repo = "lightspeed.nvim";

3235− rev = "4d8359a30b26ee5316d0e7c79af08b10cb17a57b";

3236− sha256 = "0j5qn12qmahdbyavp85yd633pap0rds4xnn37v2jhkipm0ag81wg";

3235+ rev = "8fd73360e89a219b5701339c08a469f5703cf163";

3236+ sha256 = "0y43p3sv99rsbks9r67zjm7wp3j7xpdx6ql5n18371ys8wyyddpd";

32373237 };

32383238 meta.homepage = "https://github.com/ggandor/lightspeed.nvim/";

32393239 };

@@ -3300,12 +3300,12 @@ final: prev:

33003300

33013301 litee-filetree-nvim = buildVimPluginFrom2Nix {

33023302 pname = "litee-filetree.nvim";

3303− version = "2022-02-16";

3303+ version = "2022-02-24";

33043304 src = fetchFromGitHub {

33053305 owner = "ldelossa";

33063306 repo = "litee-filetree.nvim";

3307− rev = "a736dd5a177cc36d31b702a6b6d2ffb767e84c80";

3308− sha256 = "0vhq6an7p6abhm6w9px627ymyq3r3ybsnik14k5x7pfwd5bg4c69";

3307+ rev = "f044fa4b465a102375d8d977e10e6427ec81ff63";

3308+ sha256 = "0blsnmdcyfm5phcwb6lh0ngynlj3i35nvlyvspr63v1vfxjms4x9";

33093309 };

33103310 meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/";

33113311 };

@@ -3324,12 +3324,12 @@ final: prev:

33243324

33253325 litee-nvim = buildVimPluginFrom2Nix {

33263326 pname = "litee.nvim";

3327− version = "2022-02-17";

3327+ version = "2022-02-24";

33283328 src = fetchFromGitHub {

33293329 owner = "ldelossa";

33303330 repo = "litee.nvim";

3331− rev = "dd231b288ae0bac7fe140aa78b474a094cc69e57";

3332− sha256 = "1l5hq8jj5jdyd6jbxzmdj8wqgnx4y9mrv4zbjwhs7y67rmp7alqr";

3331+ rev = "7745d713e067b5faa44cffba85278ac820c3fe2c";

3332+ sha256 = "1y8lxrzvcs55chggrbg3h0vpg2ll5fschcp78ivb3cdq9cbs8jfh";

33333333 };

33343334 meta.homepage = "https://github.com/ldelossa/litee.nvim/";

33353335 };

@@ -3467,12 +3467,12 @@ final: prev:

34673467

34683468 luasnip = buildVimPluginFrom2Nix {

34693469 pname = "luasnip";

3470− version = "2022-02-19";

3470+ version = "2022-02-24";

34713471 src = fetchFromGitHub {

34723472 owner = "l3mon4d3";

34733473 repo = "luasnip";

3474− rev = "8f2480d7a8c23c164429f2e4b487f28fc9a72d4b";

3475− sha256 = "0z0ksqc3rkb2vypdm6mkb6iq5g56fw4mxwfz5v4gqzlmfjc790vc";

3474+ rev = "e357328c02d1661ffa7ab0aba0d80b6770ca1c31";

3475+ sha256 = "0w1fwzcv4ngpwa7dkq6vi9fxg7dski7sqv2k432h1ll6ibph8yid";

34763476 };

34773477 meta.homepage = "https://github.com/l3mon4d3/luasnip/";

34783478 };

@@ -3647,12 +3647,12 @@ final: prev:

36473647

36483648 mkdx = buildVimPluginFrom2Nix {

36493649 pname = "mkdx";

3650− version = "2022-02-21";

3650+ version = "2022-02-23";

36513651 src = fetchFromGitHub {

36523652 owner = "SidOfc";

36533653 repo = "mkdx";

3654− rev = "973ab6ea0bf79021e2992cdf91627f18c4b74b5d";

3655− sha256 = "0dkfyiv2932r8lqsipq4r9yfq3yi8s42q03iw14njnr68cvnqfn3";

3654+ rev = "ca5b89e28cecc7993f769fc35b0ae794fd73af06";

3655+ sha256 = "0b9j55gjk641rnkbl8b4vmfb8pkz7jml15yf3y65lzb09fchx2dv";

36563656 };

36573657 meta.homepage = "https://github.com/SidOfc/mkdx/";

36583658 };

@@ -4043,12 +4043,12 @@ final: prev:

40434043

40444044 neorg = buildVimPluginFrom2Nix {

40454045 pname = "neorg";

4046− version = "2022-02-13";

4046+ version = "2022-02-22";

40474047 src = fetchFromGitHub {

40484048 owner = "nvim-neorg";

40494049 repo = "neorg";

4050− rev = "d6d64466f060ff9db87976ca4dfc92dda473a81c";

4051− sha256 = "0si8pq0scmpvarlssdpllfnbv3r1121dj5c6n88cy2g52f42zldi";

4050+ rev = "25dcc8d87cea1fc18280f4f1149c7dfc5b4a10bf";

4051+ sha256 = "0x5lhr18fw1zqf68r1hmnk0zh2wivdcqk7rpr5x41vq02hqy0ia2";

40524052 };

40534053 meta.homepage = "https://github.com/nvim-neorg/neorg/";

40544054 };

@@ -4163,12 +4163,12 @@ final: prev:

41634163

41644164 nerdcommenter = buildVimPluginFrom2Nix {

41654165 pname = "nerdcommenter";

4166− version = "2022-02-12";

4166+ version = "2022-02-24";

41674167 src = fetchFromGitHub {

41684168 owner = "preservim";

41694169 repo = "nerdcommenter";

4170− rev = "ec002e8f5de441d07cf5cd3ac44f41edc5f939d9";

4171− sha256 = "1z7xdgqbcpld1742rw52sc0d128b5wsx2607hwm0y0nrzajd57xb";

4170+ rev = "f8671f783baeb0739f556d9b6c440ae1767340d6";

4171+ sha256 = "1j0fxxprxw12b70isnfqixnvz2xd657rr1jphjz8277yfqpdnh2i";

41724172 };

41734173 meta.homepage = "https://github.com/preservim/nerdcommenter/";

41744174 };

@@ -4235,12 +4235,12 @@ final: prev:

42354235

42364236 nightfox-nvim = buildVimPluginFrom2Nix {

42374237 pname = "nightfox.nvim";

4238− version = "2022-02-18";

4238+ version = "2022-02-22";

42394239 src = fetchFromGitHub {

42404240 owner = "EdenEast";

42414241 repo = "nightfox.nvim";

4242− rev = "57ef9b52e015530090d9b9c49558197ae413cc19";

4243− sha256 = "16inv9r7vxwhw9blhd9sy2grf8ghpcpbw2lwd5wq39ij7vwwy2n3";

4242+ rev = "6b6cf94c588c9aba2f0bf65c175f54ddceb3aa85";

4243+ sha256 = "09maybpfclp3kj9diq98y8izwvgwn7h7phmj439c1ppjn8phgy04";

42444244 };

42454245 meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";

42464246 };

@@ -4355,12 +4355,12 @@ final: prev:

43554355

43564356 null-ls-nvim = buildVimPluginFrom2Nix {

43574357 pname = "null-ls.nvim";

4358− version = "2022-02-21";

4358+ version = "2022-02-24";

43594359 src = fetchFromGitHub {

43604360 owner = "jose-elias-alvarez";

43614361 repo = "null-ls.nvim";

4362− rev = "ae1edec262c11964d45188b56af19135c5e38c89";

4363− sha256 = "1bnw1hhm8xbs55dk99nl1sc86zvagfn5kb05vlczhngv7xrx2jpv";

4362+ rev = "ee6134db8f55ed2ef965fbc2d036de3f87a140d9";

4363+ sha256 = "04dsmih3hmby3sa9w9n6cw2lzz69jmm6yd6nx70fg07730sg364x";

43644364 };

43654365 meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";

43664366 };

@@ -4559,12 +4559,12 @@ final: prev:

45594559

45604560 nvim-dap-ui = buildVimPluginFrom2Nix {

45614561 pname = "nvim-dap-ui";

4562− version = "2022-02-22";

4562+ version = "2022-02-24";

45634563 src = fetchFromGitHub {

45644564 owner = "rcarriga";

45654565 repo = "nvim-dap-ui";

4566− rev = "5dfbd6ebfbbfd4866f7eafe723f2fdfa0440733f";

4567− sha256 = "02ss2mxi5dqa44r06iv69r5c5dp9g0cxg1dk3an1nnsh78wpibjs";

4566+ rev = "22e94f2303c8d8d72b541799d7733c5ded0733c5";

4567+ sha256 = "1761vih6pi2gs3z7bh5515nmr4hkbif82q33gghsvgzjri6a0c3q";

45684568 };

45694569 meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";

45704570 };

@@ -4655,12 +4655,12 @@ final: prev:

46554655

46564656 nvim-hlslens = buildVimPluginFrom2Nix {

46574657 pname = "nvim-hlslens";

4658− version = "2022-02-15";

4658+ version = "2022-02-23";

46594659 src = fetchFromGitHub {

46604660 owner = "kevinhwang91";

46614661 repo = "nvim-hlslens";

4662− rev = "805b61cc7841a9ef700430095ed56cda34fb8619";

4663− sha256 = "0i8nvdvf5l2966ihprwvh4py37ljlqrrclhwflzhdr7pmyy79k98";

4662+ rev = "2a883d68b93570a66baca5984e416d4c4d079c3f";

4663+ sha256 = "19i442k58jl0rrnxbbmxg0w0nghi1x3vpxy0id7bb10bg5aafwjm";

46644664 };

46654665 meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/";

46664666 };

@@ -4703,48 +4703,48 @@ final: prev:

47034703

47044704 nvim-lightbulb = buildVimPluginFrom2Nix {

47054705 pname = "nvim-lightbulb";

4706− version = "2021-11-13";

4706+ version = "2022-02-24";

47074707 src = fetchFromGitHub {

47084708 owner = "kosayoda";

47094709 repo = "nvim-lightbulb";

4710− rev = "cd5267d2d708e908dbd668c7de74e1325eb1e1da";

4711− sha256 = "1ans2kzg750d4a83hk5p9x5h51m9ywxgk6bxrcj1pwnpkhl5h75z";

4710+ rev = "29ca81408119ba809d1f922edc941868af97ee86";

4711+ sha256 = "04c5wqh42648wzrnwcgwdmwwwqvwk5qn3ncrfjl0827xnpc8049g";

47124712 };

47134713 meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";

47144714 };

47154715

47164716 nvim-lint = buildVimPluginFrom2Nix {

47174717 pname = "nvim-lint";

4718− version = "2022-02-14";

4718+ version = "2022-02-23";

47194719 src = fetchFromGitHub {

47204720 owner = "mfussenegger";

47214721 repo = "nvim-lint";

4722− rev = "da931f58a59ff0a441b9e8c0679f91790fe61870";

4723− sha256 = "13rbvf91xqhjwp4f4gp7gjgqsrbhdasb4k4swhf2f9zcqd51knz5";

4722+ rev = "f3215fa06782829a9705031fab2ec1f6ad514fd8";

4723+ sha256 = "05vsi9vgd2y6y8yv5mjc2lv4z1bdh7h4lq1cx4l2hy9p9z59kdzj";

47244724 };

47254725 meta.homepage = "https://github.com/mfussenegger/nvim-lint/";

47264726 };

47274727

47284728 nvim-lsp-ts-utils = buildVimPluginFrom2Nix {

47294729 pname = "nvim-lsp-ts-utils";

4730− version = "2022-02-11";

4730+ version = "2022-02-24";

47314731 src = fetchFromGitHub {

47324732 owner = "jose-elias-alvarez";

47334733 repo = "nvim-lsp-ts-utils";

4734− rev = "85e62e572ee63a2877267d023795488c33c0fd6f";

4735− sha256 = "1c017n0di9zb1lcqqr9pjc4z8n3d2s55qlqzn8m9rrww9mjqqhnl";

4734+ rev = "f769dc92a364f428f9a48726e4c7a0ebfdbf6f66";

4735+ sha256 = "0nl81px6lj0sz0vrpvc4hhd6ccn4am9hd8kxcqzhdz0m37zzp8cr";

47364736 };

47374737 meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/";

47384738 };

47394739

47404740 nvim-lspconfig = buildVimPluginFrom2Nix {

47414741 pname = "nvim-lspconfig";

4742− version = "2022-02-21";

4742+ version = "2022-02-24";

47434743 src = fetchFromGitHub {

47444744 owner = "neovim";

47454745 repo = "nvim-lspconfig";

4746− rev = "ec7119b166b16e681f663fcbf16b7139b38172ae";

4747− sha256 = "115d4n8i9cjafsl0nkrljcswn5qd0ny1cw7w1mw67sjddp79cqq7";

4746+ rev = "470569379d708e6c8f33f082497e0374067c6fee";

4747+ sha256 = "1rp9ymbss8jjm1k20q9vp3ayd7lv2cbdiz5ylhx9p1v1glqimigw";

47484748 };

47494749 meta.homepage = "https://github.com/neovim/nvim-lspconfig/";

47504750 };

@@ -4775,12 +4775,12 @@ final: prev:

47754775

47764776 nvim-neoclip-lua = buildVimPluginFrom2Nix {

47774777 pname = "nvim-neoclip.lua";

4778− version = "2022-02-20";

4778+ version = "2022-02-22";

47794779 src = fetchFromGitHub {

47804780 owner = "AckslD";

47814781 repo = "nvim-neoclip.lua";

4782− rev = "8213c2c59c99fdaccb3ea5fe9fed2a532fd3fdf8";

4783− sha256 = "1hi1yjdaxjsawgci230cnxa5anniq2s6ijxy7z2ibsyfn1jcpb0b";

4782+ rev = "d859891e4bff9729ad6e63bd4aebc51946de8786";

4783+ sha256 = "17dbvr1y7hzrv04c89b4nmgmgg0qccrkz6qsh7vsava0lvjs4zm5";

47844784 };

47854785 meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/";

47864786 };

@@ -4875,20 +4875,20 @@ final: prev:

48754875 src = fetchFromGitHub {

48764876 owner = "kyazdani42";

48774877 repo = "nvim-tree.lua";

4878− rev = "3486c48225265792842545e90dc041e5a214686d";

4879− sha256 = "0bhp85j5446riacblingmd6z316hdh92lpp0p2kd4sckfw6ih8ja";

4878+ rev = "48e76bc0317de95ac154ae3a26193bf8881340a1";

4879+ sha256 = "06z7c5kcyxdcx7wi5yaw1d1mv3wah5y0kkjn7z5py9x82snk4rwm";

48804880 };

48814881 meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";

48824882 };

48834883

48844884 nvim-treesitter = buildVimPluginFrom2Nix {

48854885 pname = "nvim-treesitter";

4886− version = "2022-02-22";

4886+ version = "2022-02-24";

48874887 src = fetchFromGitHub {

48884888 owner = "nvim-treesitter";

48894889 repo = "nvim-treesitter";

4890− rev = "3533721282669e945b62b3ae9c53d4c5ffe16c76";

4891− sha256 = "0mlckwhammzh93kililzipynqzw4r09r2xk77yygka54y8vv9kjm";

4890+ rev = "fb7a56548b89670e2147beb15e5bd2487fffc800";

4891+ sha256 = "1ada3hzhya4qcqri63plbvvd7xf6gc7k9rr7v5z53lxj1l4s48v2";

48924892 };

48934893 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";

48944894 };

@@ -4931,24 +4931,24 @@ final: prev:

49314931

49324932 nvim-treesitter-textobjects = buildVimPluginFrom2Nix {

49334933 pname = "nvim-treesitter-textobjects";

4934− version = "2022-02-07";

4934+ version = "2022-02-23";

49354935 src = fetchFromGitHub {

49364936 owner = "nvim-treesitter";

49374937 repo = "nvim-treesitter-textobjects";

4938− rev = "fea609aa58b3390a09e8df0e96902fd4b094d8b7";

4939− sha256 = "0221ax71334ghsr8xznp9jk2iv9r0bin47ch8r7hsfh4r0wgc5w7";

4938+ rev = "e23fc8ac796b722dd30f40467d59581d4854c692";

4939+ sha256 = "15fa27dbyrmbsiysmy3rm3ih9jnxrlvvzlf966jcm29ph225zxmn";

49404940 };

49414941 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";

49424942 };

49434943

49444944 nvim-ts-autotag = buildVimPluginFrom2Nix {

49454945 pname = "nvim-ts-autotag";

4946− version = "2022-02-09";

4946+ version = "2022-02-24";

49474947 src = fetchFromGitHub {

49484948 owner = "windwp";

49494949 repo = "nvim-ts-autotag";

4950− rev = "5149f0c6557fa4a492d82895a564f4cd4a9c7715";

4951− sha256 = "0zyx4qkm6gq2lw75f2b1k974dv3bz12gd4f6j76dr805b8kq6l5m";

4950+ rev = "178e40a213eeea4810cad440b6be56ceeb6af434";

4951+ sha256 = "00zlgc7bnryw3ys1ihsf2pyf7f9wzlgmqrkp8bs99nv5qji6bym4";

49524952 };

49534953 meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";

49544954 };

@@ -4967,12 +4967,12 @@ final: prev:

49674967

49684968 nvim-ts-rainbow = buildVimPluginFrom2Nix {

49694969 pname = "nvim-ts-rainbow";

4970− version = "2022-02-09";

4970+ version = "2022-02-24";

49714971 src = fetchFromGitHub {

49724972 owner = "p00f";

49734973 repo = "nvim-ts-rainbow";

4974− rev = "c6c26c4def0e9cd82f371ba677d6fc9baa0038af";

4975− sha256 = "0q0awc93l6cafbvb3wghrmvsn0qqg8hgkhfy5r86bvr0prwbvxga";

4974+ rev = "35bef9212441ef3f4b69c8ead0fbde123357bb4d";

4975+ sha256 = "0dnr3dilcsyfrgwv497aypvn6jk5rzwdqjs09gn5fwfg354nhsbk";

49764976 };

49774977 meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";

49784978 };

@@ -5111,12 +5111,12 @@ final: prev:

51115111

51125112 onedarkpro-nvim = buildVimPluginFrom2Nix {

51135113 pname = "onedarkpro.nvim";

5114− version = "2022-02-16";

5114+ version = "2022-02-24";

51155115 src = fetchFromGitHub {

51165116 owner = "olimorris";

51175117 repo = "onedarkpro.nvim";

5118− rev = "7bfdf32cae7bf83f2209f25a180d9f0bc5330919";

5119− sha256 = "1877bv4cy1gignpdvhp8xfqgmh4yg04ak7amf9h1q4wg29hna15a";

5118+ rev = "fda3b36be8613f6ba303082fed7a7e20fdf52205";

5119+ sha256 = "14i3lqz1l9k8ai9lskrgz511srvf2wwfjd8zlbkmx55ws085ifca";

51205120 };

51215121 meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";

51225122 };

@@ -5605,12 +5605,12 @@ final: prev:

56055605

56065606 refactoring-nvim = buildVimPluginFrom2Nix {

56075607 pname = "refactoring.nvim";

5608− version = "2022-02-18";

5608+ version = "2022-02-24";

56095609 src = fetchFromGitHub {

56105610 owner = "theprimeagen";

56115611 repo = "refactoring.nvim";

5612− rev = "7ebc76da62638a852a5a287a00ff94af32fe28da";

5613− sha256 = "0gs5qb5s2ilqs2nskd9llgjd5zqcyx3yacyh56xwxr65yjvnpjg8";

5612+ rev = "85e3474449967d2ee4377fbb9633f21093a80187";

5613+ sha256 = "05scspf4jxhgbrfnnm363mb8g633rn83zmlxmwsqs1zzvpzgjxvp";

56145614 };

56155615 meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";

56165616 };

@@ -5797,12 +5797,12 @@ final: prev:

57975797

57985798 SchemaStore-nvim = buildVimPluginFrom2Nix {

57995799 pname = "SchemaStore.nvim";

5800− version = "2022-02-18";

5800+ version = "2022-02-24";

58015801 src = fetchFromGitHub {

58025802 owner = "b0o";

58035803 repo = "SchemaStore.nvim";

5804− rev = "45761cc7f76abc543e614e2fafa1ea146f4313bb";

5805− sha256 = "14d7pfrr57i1b8kjg6bn3v6z7pa7vqrpa0gi4y0wqjmwiyl22zvm";

5804+ rev = "90f1123c0d63f41627dca0c5258a4193274edba0";

5805+ sha256 = "0f3jgj1bwvxzmvqf7nbbbwyav5wxmr9kyjw4j4fq7n3mrcapdjj0";

58065806 };

58075807 meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";

58085808 };

@@ -6036,6 +6036,18 @@ final: prev:

60366036 meta.homepage = "https://github.com/chikatoike/sourcemap.vim/";

60376037 };

60386038

6039+ space-vim = buildVimPluginFrom2Nix {

6040+ pname = "space-vim";

6041+ version = "2022-02-15";

6042+ src = fetchFromGitHub {

6043+ owner = "liuchengxu";

6044+ repo = "space-vim";

6045+ rev = "637390b17a8cd7d154a0d90a5c07612f1538a28e";

6046+ sha256 = "0f43mspfnch1ifqa9rgvc64dmk0hz3cirz8iicpszmdr0fphq3xs";

6047+ };

6048+ meta.homepage = "https://github.com/liuchengxu/space-vim/";

6049+ };

6050+

60396051 SpaceCamp = buildVimPluginFrom2Nix {

60406052 pname = "SpaceCamp";

60416053 version = "2021-04-07";

@@ -6072,6 +6084,18 @@ final: prev:

60726084 meta.homepage = "https://github.com/ctjhoa/spacevim/";

60736085 };

60746086

6087+ SpaceVim = buildVimPluginFrom2Nix {

6088+ pname = "SpaceVim";

6089+ version = "2022-02-20";

6090+ src = fetchFromGitHub {

6091+ owner = "SpaceVim";

6092+ repo = "SpaceVim";

6093+ rev = "6975374b3be303b820c61c2fa33a43fe157265ec";

6094+ sha256 = "1lqsk7cpf9nb7h3wnmv4df6047iyck0p662m3gqy57xrhl33j33n";

6095+ };

6096+ meta.homepage = "https://github.com/SpaceVim/SpaceVim/";

6097+ };

6098+

60756099 sparkup = buildVimPluginFrom2Nix {

60766100 pname = "sparkup";

60776101 version = "2012-06-11";

@@ -6243,12 +6267,12 @@ final: prev:

62436267

62446268 surround-nvim = buildVimPluginFrom2Nix {

62456269 pname = "surround.nvim";

6246− version = "2022-02-15";

6270+ version = "2022-02-22";

62476271 src = fetchFromGitHub {

62486272 owner = "ur4ltz";

62496273 repo = "surround.nvim";

6250− rev = "01756d3f31aeb2307cca5b73f9fa74a0802e5bc3";

6251− sha256 = "0adxynnlbybj04vxflvrqhcc7z8y3m7myimdm9xyz8vi18qkfk5p";

6274+ rev = "633068182cf894480341b992445f0f0d2883721d";

6275+ sha256 = "0mqg4vki23rs0rj6zyfkd1ki9wndjifp0lmnnw99x3i1qc0ba47i";

62526276 };

62536277 meta.homepage = "https://github.com/ur4ltz/surround.nvim/";

62546278 };

@@ -6654,12 +6678,12 @@ final: prev:

66546678

66556679 telescope-nvim = buildVimPluginFrom2Nix {

66566680 pname = "telescope.nvim";

6657− version = "2022-02-15";

6681+ version = "2022-02-23";

66586682 src = fetchFromGitHub {

66596683 owner = "nvim-telescope";

66606684 repo = "telescope.nvim";

6661− rev = "df0b35c8bc0944164828ccba8ea17941423c6725";

6662− sha256 = "0ryx507ynil4y8y989df06d2j6dci5ywdjr4nb7kgwrfj2hn4cv9";

6685+ rev = "567ec85b157f1606b500a0f755181f284810a28e";

6686+ sha256 = "1pzdn12zg9g3y03grw2xha2h5qia6bbi8058n3z5g2ail58hnw2n";

66636687 };

66646688 meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";

66656689 };

@@ -6810,14 +6834,14 @@ final: prev:

68106834

68116835 todo-nvim = buildVimPluginFrom2Nix {

68126836 pname = "todo.nvim";

6813− version = "2022-02-19";

6837+ version = "2022-02-23";

68146838 src = fetchFromGitHub {

68156839 owner = "AmeerTaweel";

68166840 repo = "todo.nvim";

6817− rev = "b252b4116812352161acfa73cdce6a15ffbde2eb";

6818− sha256 = "+m3jy0ue0rAzRQ4hJDFPVVjNaOGNImkZjhIqI/AGTeY=";

6841+ rev = "6bd31dfd64b2730b33aad89423a1055c22fe276a";

6842+ sha256 = "1887d1bjzixrdinr857cqq4x84760scik04r9mz9zmwdf8nfgh6b";

68196843 };

6820− meta.homepage = "https://github.com/AmeerTaweel/todo.nvim";

6844+ meta.homepage = "https://github.com/AmeerTaweel/todo.nvim/";

68216845 };

68226846

68236847 todo-txt-vim = buildVimPluginFrom2Nix {

@@ -7711,12 +7735,12 @@ final: prev:

77117735

77127736 vim-clap = buildVimPluginFrom2Nix {

77137737 pname = "vim-clap";

7714− version = "2022-02-22";

7738+ version = "2022-02-24";

77157739 src = fetchFromGitHub {

77167740 owner = "liuchengxu";

77177741 repo = "vim-clap";

7718− rev = "c22b4eaf296f8779ca8e6ccfa0a1497c4b5831ff";

7719− sha256 = "13x7ykvh9qfdcik2x3yjz49xwww48b3cm1qq1qripnf2b19an3z6";

7742+ rev = "73fe68b6bfbd9201fb0facf2a13cb819f79b3d82";

7743+ sha256 = "0zs9rg21p0aws6shzvqi5khc3kipqh4yvcx5jpf8f3xcdlv13mrk";

77207744 };

77217745 meta.homepage = "https://github.com/liuchengxu/vim-clap/";

77227746 };

@@ -8611,12 +8635,12 @@ final: prev:

86118635

86128636 vim-gitgutter = buildVimPluginFrom2Nix {

86138637 pname = "vim-gitgutter";

8614− version = "2022-02-19";

8638+ version = "2022-02-23";

86158639 src = fetchFromGitHub {

86168640 owner = "airblade";

86178641 repo = "vim-gitgutter";

8618− rev = "e433d5ddc1e37cb07d646d58b832a88ee848988d";

8619− sha256 = "1li873x55q0ia2098ciwn5ayq23si9zqqildz8qxa5xdwv318j8z";

8642+ rev = "18d12985ea6cb7ede59755ff4fd0a9fa1e6bf835";

8643+ sha256 = "1gs7vaf9pyd8ji0vc9iafd46g4iqy8rpa2jif0k56wxzcrjw4r22";

86208644 };

86218645 meta.homepage = "https://github.com/airblade/vim-gitgutter/";

86228646 };

@@ -11087,12 +11111,12 @@ final: prev:

1108711111

1108811112 vim-toml = buildVimPluginFrom2Nix {

1108911113 pname = "vim-toml";

11090− version = "2021-12-06";

11114+ version = "2022-02-23";

1109111115 src = fetchFromGitHub {

1109211116 owner = "cespare";

1109311117 repo = "vim-toml";

11094− rev = "2c8983cc391287e5e26e015c3ab9c38de9f9b759";

11095− sha256 = "1mxn2z3p3lnk3ibwxhqb3dih25qalpqfwy0rx7i393vpjbkn79py";

11118+ rev = "89bcca8a3aeab360f6dfe5ce70999fc928669411";

11119+ sha256 = "0lw45cchgmank2w0y864qwhzw5cjbggk1p46vgjgs7cn1jsdhvr0";

1109611120 };

1109711121 meta.homepage = "https://github.com/cespare/vim-toml/";

1109811122 };

@@ -11603,12 +11627,12 @@ final: prev:

1160311627

1160411628 vimspector = buildVimPluginFrom2Nix {

1160511629 pname = "vimspector";

11606− version = "2022-02-19";

11630+ version = "2022-02-24";

1160711631 src = fetchFromGitHub {

1160811632 owner = "puremourning";

1160911633 repo = "vimspector";

11610− rev = "d6641959336d0f0303c94cbea131b160f9dcabe3";

11611− sha256 = "0r2sr4kissqvi5d63girgxp6swbkj0czfaf5nbq2c4gjnpkr6clx";

11634+ rev = "d044dea0c2669c740052a47900e6e16f64444b63";

11635+ sha256 = "1sv1r4pcz1fx99qi566nncs116vw3wsny344lcnsh0r6b2sc0bz0";

1161211636 fetchSubmodules = true;

1161311637 };

1161411638 meta.homepage = "https://github.com/puremourning/vimspector/";

pkgs/misc/vim-plugins/markdown-preview-nvim/fix-node-paths.patch → pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patchrenamed

The content is the same.

pkgs/misc/vim-plugins/markdown-preview-nvim/package.json → pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.jsonrenamed

The content is the same.

pkgs/misc/vim-plugins/overrides.nix → pkgs/applications/editors/vim/plugins/overrides.nixrenamed+1−1

@@ -414,7 +414,7 @@ self: super: {

414414

415415 markdown-preview-nvim = super.markdown-preview-nvim.overrideAttrs (old: let

416416 # We only need its dependencies `node-modules`.

417− nodeDep = nodePackages."markdown-preview-nvim-../../misc/vim-plugins/markdown-preview-nvim".overrideAttrs (old: {

417+ nodeDep = nodePackages."markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim".overrideAttrs (old: {

418418 dontNpmInstall = true;

419419 });

420420 in {

pkgs/misc/vim-plugins/patches/fruzzy/get_version.patch → pkgs/applications/editors/vim/plugins/patches/fruzzy/get_version.patchrenamed

The content is the same.

pkgs/misc/vim-plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch → pkgs/applications/editors/vim/plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patchrenamed

The content is the same.

pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch → pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patchrenamed

The content is the same.

pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch → pkgs/applications/editors/vim/plugins/patches/vim-grammarous/set_default_languagetool.patchrenamed

The content is the same.

pkgs/misc/vim-plugins/readme.md → pkgs/applications/editors/vim/plugins/readme.mdrenamed

The content is the same.

pkgs/misc/vim-plugins/update-shell.nix → pkgs/applications/editors/vim/plugins/update-shell.nixrenamed+2−1

@@ -1,5 +1,6 @@

1−{ pkgs ? import ../../.. { } }:

1+{ pkgs ? import ../../../../.. { } }:

3+# Ideally, pkgs points to default.nix file of Nixpkgs official tree

34with pkgs;

45let

56 pyEnv = python3.withPackages (ps: [ ps.GitPython ]);

pkgs/misc/vim-plugins/update.py → pkgs/applications/editors/vim/plugins/update.pyrenamed+6−2

@@ -13,6 +13,9 @@

1313# refer to:

1414#

1515# https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/vim.section.md#updating-plugins-in-nixpkgs-updating-plugins-in-nixpkgs

16+#

17+# (or the equivalent file /doc/languages-frameworks/vim.section.md from Nixpkgs master tree).

18+#

1619

1720import inspect

1821import os

@@ -27,7 +30,8 @@ log.addHandler(logging.StreamHandler())

2730

2831# Import plugin update library from maintainers/scripts/pluginupdate.py

2932ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))

30−sys.path.insert(0, os.path.join(ROOT.parent.parent.parent, "maintainers", "scripts"))

33+# Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree

34+sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts"))

3135import pluginupdate

3236

3337GET_PLUGINS = f"""(with import <localpkgs> {{}};

@@ -47,7 +51,7 @@ let

4751in lib.filterAttrs (n: v: v != null) checksums)"""

4852

4953HEADER = (

50− "# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!"

54+ "# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!"

5155)

5256

5357

pkgs/misc/vim-plugins/vim-gen-doc-hook.sh → pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.shrenamed

The content is the same.

pkgs/misc/vim-plugins/vim-plugin-names → pkgs/applications/editors/vim/plugins/vim-plugin-namesrenamed+2

@@ -420,6 +420,7 @@ lighttiger2505/deoplete-vim-lsp

420420lilydjwg/colorizer

421421lilydjwg/fcitx.vim@fcitx5

422422liuchengxu/graphviz.vim

423+liuchengxu/space-vim

423424liuchengxu/vim-clap

424425liuchengxu/vim-which-key

425426liuchengxu/vista.vim

@@ -772,6 +773,7 @@ sodapopcan/vim-twiggy

772773solarnz/arcanist.vim

773774sonph/onehalf

774775sotte/presenting.vim

776+SpaceVim/SpaceVim

775777srcery-colors/srcery-vim

776778steelsojka/completion-buffers

777779steelsojka/pears.nvim

pkgs/misc/vim-plugins/vim-utils.nix → pkgs/applications/editors/vim/plugins/vim-utils.nixrenamed+2−1

@@ -82,7 +82,8 @@ See vimHelpTags sample code below.

8282

8383CONTRIBUTING AND CUSTOMIZING

8484============================

85−The example file pkgs/misc/vim-plugins/default.nix provides both:

85+The example file pkgs/applications/editors/vim/plugins/default.nix provides

86+both:

8687* manually mantained plugins

8788* plugins created by VAM's nix#ExportPluginsForNix implementation

8889

pkgs/misc/vim-plugins/vim2nix/README.txt → pkgs/applications/editors/vim/plugins/vim2nix/README.txtrenamed

The content is the same.

pkgs/misc/vim-plugins/vim2nix/addon-info.json → pkgs/applications/editors/vim/plugins/vim2nix/addon-info.jsonrenamed

The content is the same.

pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim → pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vimrenamed

The content is the same.

pkgs/development/node-packages/node-packages.json+1−1

@@ -198,7 +198,7 @@

198198, "markdownlint-cli"

199199, "markdownlint-cli2"

200200, "markdown-link-check"

201−, {"markdown-preview-nvim": "../../misc/vim-plugins/markdown-preview-nvim"}

201+, {"markdown-preview-nvim": "../../applications/editors/vim/plugins/markdown-preview-nvim"}

202202, "mastodon-bot"

203203, "mathjax"

204204, "meat"

pkgs/development/node-packages/node-packages.nix+2−2

@@ -107807,11 +107807,11 @@ in

107807107807 bypassCache = true;

107808107808 reconstructLock = true;

107809107809 };

107810− "markdown-preview-nvim-../../misc/vim-plugins/markdown-preview-nvim" = nodeEnv.buildNodePackage {

107810+ "markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim" = nodeEnv.buildNodePackage {

107811107811 name = "markdown-preview-vim";

107812107812 packageName = "markdown-preview-vim";

107813107813 version = "0.0.1";

107814− src = ../../misc/vim-plugins/markdown-preview-nvim;

107814+ src = ../../applications/editors/vim/plugins/markdown-preview-nvim;

107815107815 dependencies = [

107816107816 sources."accepts-1.3.8"

107817107817 sources."after-0.8.2"

pkgs/tools/nix/statix/default.nix+2−1

@@ -2,7 +2,8 @@

33rustPlatform.buildRustPackage rec {

44 pname = "statix";

5− # also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix

5+ # also update version of the vim plugin in

6+ # pkgs/applications/editors/vim/plugins/overrides.nix

67 # the version can be found in flake.nix of the source code

78 version = "0.5.4";

pkgs/tools/text/rosie/default.nix+3−2

@@ -1,5 +1,5 @@

1−{ stdenv

2−, lib

1+{ lib

2+, stdenv

33, fetchgit

44, libbsd

55, readline

@@ -8,6 +8,7 @@

88stdenv.mkDerivation rec {

99 pname = "rosie";

1010 version = "unstable-2020-01-11";

11+

1112 src = fetchgit {

1213 url = "https://gitlab.com/rosie-pattern-language/rosie";

1314 rev = "670e9027563609ba2ea31e14e2621a1302742795";

pkgs/top-level/all-packages.nix+2−3

@@ -33999,12 +33999,11 @@ with pkgs;

3399933999

3400034000 viewnior = callPackage ../applications/graphics/viewnior { };

3400134001

34002−

34003− vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix {

34002+ vimUtils = callPackage ../applications/editors/vim/plugins/vim-utils.nix {

3400434003 inherit (lua51Packages) hasLuaModule;

3400534004 };

3400634005

34007− vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins {

34006+ vimPlugins = recurseIntoAttrs (callPackage ../applications/editors/vim/plugins {

3400834007 llvmPackages = llvmPackages_6;

3400934008 luaPackages = lua51Packages;

3401034009 });