Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update.py: updater vim updater #166941

Merged
merged 4 commits into from
Apr 5, 2022
Merged

update.py: updater vim updater #166941

merged 4 commits into from
Apr 5, 2022

Conversation

teto
Copy link
Member

@teto teto commented Apr 2, 2022 •
edited
Loading

We want to support plugins on other hosts than github. To ease that I've changed the format of vim-plugin-names to CSV, see #136248 for reasoning

A more structured format will allow more features too.

  • update.py: updater vim updater
  • vimPlugins: update
  • kakounePlugins: update

Fixes #136248 #166007

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@teto teto requested a review from jonringer as a code owner April 2, 2022 16:16
@teto teto mentioned this pull request Apr 2, 2022
Closed
@teto teto force-pushed the vim-plugins-toml branch 4 times, most recently from cff9349 to 2c5c1d7 Compare April 3, 2022 15:30
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation labels Apr 3, 2022
@ofborg ofborg bot added 8.has: clean-up 8.has: package (new) This PR adds a new package labels Apr 3, 2022
@ofborg ofborg bot requested review from jagajaga and MarcWeber April 3, 2022 15:53
@teto teto force-pushed the vim-plugins-toml branch from 2c5c1d7 to 71cdd68 Compare April 3, 2022 16:00
Matthieu Coudron added 4 commits April 3, 2022 18:14
update.py: updater vim updater
ec6cf1a 
We want to support plugins on other hosts than github.
A more structured format will allow more features too.
kakounePlugins: update
69daee8
vimPlugins: update
d525753 
vimPlugins: update

vimPlugins: update
doc: mention the new format expected by the new vim updater
84fd282 
e.g., from simple strings to csv
@teto teto force-pushed the vim-plugins-toml branch from 71cdd68 to 84fd282 Compare April 3, 2022 16:14
@teto teto mentioned this pull request Apr 3, 2022
Closed
@teto
Copy link
Member Author

teto commented Apr 5, 2022

i am afraid it will bitrot and there doesnt seem to be much interest in reviewing.I dont like it but will merge. From a pure nixpkgs user it shouldn't change anything.

@teto teto merged commit d396c7d into NixOS:master Apr 5, 2022
@teto teto deleted the vim-plugins-toml branch April 5, 2022 07:33
andrevmatos
andrevmatos reviewed Apr 5, 2022
View reviewed changes
pkgs/applications/editors/vim/plugins/generated.nix
@@ -987,18 +1372,6 @@ final: prev:
meta.homepage = "https://github.com/iamcco/coc-tailwindcss/";
};

coc-nvim = buildVimPluginFrom2Nix {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What? coc-nvim got renamed to release below? This seems to have broken everyone's usage of coc-nvim plugin

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oups sry I put the branch in the wrong colum: https://github.com/NixOS/nixpkgs/pull/166941/files#r842990175 . I am away from keyboard for the next few hours if anyone want to fix it that would be awesome !

@andrevmatos
Copy link
Member

This currently broke coc-nvim (and possibly other renamings?) on nixos-unstable-small

andrevmatos
andrevmatos reviewed Apr 5, 2022
View reviewed changes
pkgs/applications/editors/vim/plugins/generated.nix
Comment on lines +12123 to +12133
release = buildVimPluginFrom2Nix {
pname = "release";
version = "2022-04-02";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc.nvim";
rev = "d6a665bb13044d4899e2a3529c3ca68104d9b2f5";
sha256 = "0pgzygvn5x2szm0fz12rlbblf1pk92r8p5fn8c7frxnmb2nsgsvd";
};
meta.homepage = "https://github.com/neoclide/coc.nvim/";
};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here o.O

teto
teto commented Apr 5, 2022
View reviewed changes
pkgs/applications/editors/vim/plugins/vim-plugin-names
https://github.com/iamcco/coc-spell-checker/,,
https://github.com/coc-extensions/coc-svelte/,,
https://github.com/iamcco/coc-tailwindcss/,,
https://github.com/neoclide/coc.nvim/,,release
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here it should be ...,release,

@andrevmatos
Copy link
Member

Also, even trying to use the renamed plugin, it seems to have stopped working on stable/latest nvim:

[coc.nvim] build/index.js not found, please install dependencies and compile coc.nvim by: yarn install

@teto
Copy link
Member Author

teto commented Apr 5, 2022

just changing the line #166941 (review) and regenerating the file should fix it

@andrevmatos andrevmatos mentioned this pull request Apr 5, 2022
Merged
13 tasks
@andrevmatos
Copy link
Member

andrevmatos commented Apr 5, 2022 •
edited
Loading

@teto #167369 - tested locally and the error above also went away.

@teto
Copy link
Member Author

teto commented Apr 5, 2022 •
edited
Loading

cool thanks for taking care of it. Sorry for the annoyance. I usually run a nixpkgs-review but I had no space anymorre :/

dgbuckley added a commit to dgbuckley/nixpkgs that referenced this pull request Jun 8, 2022
@dgbuckley
update.py: update kakoune updater
7feafba 
Ensure the kakoune updater works with the changes from NixOS#166941
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrevmatos andrevmatos andrevmatos left review comments

@jonringer jonringer Awaiting requested review from jonringer

@jagajaga jagajaga Awaiting requested review from jagajaga

@MarcWeber MarcWeber Awaiting requested review from MarcWeber

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: vim 8.has: changelog 8.has: clean-up 8.has: documentation This PR adds or changes documentation 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

adopt a new format for pkgs/misc/vim-plugins/vim-plugin-names and maintainers/scripts/luarocks-packages.csv
2 participants
@teto @andrevmatos