Skip to content

nixpkgs-plugin-update: updated plugin versioning; vimPlugins: update on 2025-12-15#470251

Merged
MattSturgeon merged 4 commits intoNixOS:masterfrom
khaneliman:vim-updater-tweaks
Dec 15, 2025
Merged

nixpkgs-plugin-update: updated plugin versioning; vimPlugins: update on 2025-12-15#470251
MattSturgeon merged 4 commits intoNixOS:masterfrom
khaneliman:vim-updater-tweaks

Conversation

@khaneliman
Copy link
Contributor

@khaneliman khaneliman commented Dec 12, 2025 •
edited
Loading

Things done

Updated to fetch tags and rename versions to match latest Nixpkgs versioning naming policy. Will do hash in a follow up to keep diff small and review easier.

Included a package set bump just to show what its generating.

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: vim Advanced text editor labels Dec 12, 2025
@MattSturgeon
Copy link
Contributor

MattSturgeon commented Dec 12, 2025

I've not read the python changes enough to properly review them, but I've scanned through a decent chunk of the generated.nix diff and file and the end result seems to be correct.

Consider this an ACK from me if I don't come back to review properly.

GaetanLepage
GaetanLepage approved these changes Dec 13, 2025
View reviewed changes
Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

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

Ideally, you could have split the cosmetic changes (log string formatting, scope refacoring...) and the feature addition into two different commits.
Otherwise, the diff looks fine and if it ended up working, we should be good to go!

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Dec 13, 2025
@khaneliman
Copy link
Contributor Author

khaneliman commented Dec 13, 2025

Ideally, you could have split the cosmetic changes (log string formatting, scope refacoring...) and the feature addition into two different commits.

Yeah looks like I missed ripping some of that out.. I cherry-picked this out from a bigger refactor branch I had just to focus on this specific issue for a smaller PR.

@khaneliman
Copy link
Contributor Author

khaneliman commented Dec 13, 2025

@GaetanLepage pulled out the unrelated string formatting / redundant else changes. Wanted to keep this as focused on the specific need, as possible.

MattSturgeon
MattSturgeon reviewed Dec 13, 2025
View reviewed changes
Copy link
Contributor

@MattSturgeon MattSturgeon left a comment

Choose a reason for hiding this comment

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

pulled out the unrelated string formatting / redundant else changes. Wanted to keep this as focused on the specific need, as possible.

Awesome. That makes this much easier to review!

@GaetanLepage

This comment was marked as outdated.

Sign in to view
@GaetanLepage
Copy link
Contributor

GaetanLepage commented Dec 13, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 470251
Commit: eff564e63365bef317e688c6b86adb6c4db496ec

x86_64-linux

✅ 26 packages built:
  • lua51Packages.fzf-lua
  • lua51Packages.grug-far-nvim
  • luaPackages.fzf-lua (lua52Packages.fzf-lua)
  • luaPackages.grug-far-nvim (lua52Packages.grug-far-nvim)
  • lua53Packages.fzf-lua
  • lua53Packages.grug-far-nvim
  • lua54Packages.fzf-lua
  • lua54Packages.grug-far-nvim
  • luajitPackages.fzf-lua
  • luajitPackages.grug-far-nvim
  • luarocks-packages-updater
  • luarocks-packages-updater.dist
  • python312Packages.nixpkgs-plugin-update
  • python312Packages.nixpkgs-plugin-update.dist
  • python313Packages.nixpkgs-plugin-update
  • python313Packages.nixpkgs-plugin-update.dist
  • tests.vim.test_vim_with_vim_nix
  • tests.vim.test_vim_with_vim_nix_using_plug
  • vimPlugins.avante-nvim
  • vimPlugins.corePlugins
  • vimPlugins.fzf-lua
  • vimPlugins.grug-far-nvim
  • vimPlugins.vectorcode-nvim
  • vimPlugins.vim2nix
  • vimPluginsUpdater
  • vimacs

aarch64-linux

✅ 25 packages built:
  • lua51Packages.fzf-lua
  • lua51Packages.grug-far-nvim
  • luaPackages.fzf-lua (lua52Packages.fzf-lua)
  • luaPackages.grug-far-nvim (lua52Packages.grug-far-nvim)
  • lua53Packages.fzf-lua
  • lua53Packages.grug-far-nvim
  • lua54Packages.fzf-lua
  • lua54Packages.grug-far-nvim
  • luajitPackages.fzf-lua
  • luajitPackages.grug-far-nvim
  • luarocks-packages-updater
  • luarocks-packages-updater.dist
  • python312Packages.nixpkgs-plugin-update
  • python312Packages.nixpkgs-plugin-update.dist
  • python313Packages.nixpkgs-plugin-update
  • python313Packages.nixpkgs-plugin-update.dist
  • tests.vim.test_vim_with_vim_nix
  • tests.vim.test_vim_with_vim_nix_using_plug
  • vimPlugins.avante-nvim
  • vimPlugins.corePlugins
  • vimPlugins.fzf-lua
  • vimPlugins.grug-far-nvim
  • vimPlugins.vim2nix
  • vimPluginsUpdater
  • vimacs

x86_64-darwin

❌ 1 package failed to build:
  • vimacs
✅ 24 packages built:
  • lua51Packages.fzf-lua
  • lua51Packages.grug-far-nvim
  • luaPackages.fzf-lua (lua52Packages.fzf-lua)
  • luaPackages.grug-far-nvim (lua52Packages.grug-far-nvim)
  • lua53Packages.fzf-lua
  • lua53Packages.grug-far-nvim
  • lua54Packages.fzf-lua
  • lua54Packages.grug-far-nvim
  • luajitPackages.fzf-lua
  • luajitPackages.grug-far-nvim
  • luarocks-packages-updater
  • luarocks-packages-updater.dist
  • python312Packages.nixpkgs-plugin-update
  • python312Packages.nixpkgs-plugin-update.dist
  • python313Packages.nixpkgs-plugin-update
  • python313Packages.nixpkgs-plugin-update.dist
  • tests.vim.test_vim_with_vim_nix
  • tests.vim.test_vim_with_vim_nix_using_plug
  • vimPlugins.avante-nvim
  • vimPlugins.corePlugins
  • vimPlugins.fzf-lua
  • vimPlugins.grug-far-nvim
  • vimPlugins.vim2nix
  • vimPluginsUpdater

aarch64-darwin

❌ 1 package failed to build:
  • vimacs
✅ 24 packages built:
  • lua51Packages.fzf-lua
  • lua51Packages.grug-far-nvim
  • luaPackages.fzf-lua (lua52Packages.fzf-lua)
  • luaPackages.grug-far-nvim (lua52Packages.grug-far-nvim)
  • lua53Packages.fzf-lua
  • lua53Packages.grug-far-nvim
  • lua54Packages.fzf-lua
  • lua54Packages.grug-far-nvim
  • luajitPackages.fzf-lua
  • luajitPackages.grug-far-nvim
  • luarocks-packages-updater
  • luarocks-packages-updater.dist
  • python312Packages.nixpkgs-plugin-update
  • python312Packages.nixpkgs-plugin-update.dist
  • python313Packages.nixpkgs-plugin-update
  • python313Packages.nixpkgs-plugin-update.dist
  • tests.vim.test_vim_with_vim_nix
  • tests.vim.test_vim_with_vim_nix_using_plug
  • vimPlugins.avante-nvim
  • vimPlugins.corePlugins
  • vimPlugins.fzf-lua
  • vimPlugins.grug-far-nvim
  • vimPlugins.vim2nix
  • vimPluginsUpdater

PerchunPak
PerchunPak suggested changes Dec 13, 2025
View reviewed changes
Copy link
Member

@PerchunPak PerchunPak left a comment

Choose a reason for hiding this comment

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

I do appreciate your effort, but the whole system with urllib, threading, mixing 3-5 different ways to get the information about a plugin (including usage of undocumented, probably deprecated, XML API) is doomed to fail. This code is really not sustainable

Any efforts to improve this script will only drive the code more insane. We should really start looking at #380691.

(But that doesn't mean I block this, or any other, PR)

@khaneliman khaneliman mentioned this pull request Dec 14, 2025
Closed
3 tasks
@nixpkgs-ci nixpkgs-ci bot requested review from GaetanLepage and teto December 14, 2025 21:05
@nixpkgs-ci nixpkgs-ci bot added the 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. label Dec 14, 2025
@khaneliman khaneliman force-pushed the vim-updater-tweaks branch 2 times, most recently from 87014a4 to cc1fc85 Compare December 14, 2025 21:12
@khaneliman
Copy link
Contributor Author

khaneliman commented Dec 15, 2025

Pulled nvim-treesitter stuff out, will be handled in #470883

PerchunPak
PerchunPak reviewed Dec 15, 2025
View reviewed changes
Copy link
Member

@PerchunPak PerchunPak left a comment

Choose a reason for hiding this comment

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

Aside from cosmetic changes, this is in good shape, and the next review will definitely be an approval from me.

PerchunPak
PerchunPak approved these changes Dec 15, 2025
View reviewed changes
Copy link
Member

@PerchunPak PerchunPak left a comment

Choose a reason for hiding this comment

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

Thanks!

Although, first commit message seems wrong, and all the vimPlugins: update should be squashed

@khaneliman khaneliman changed the title nixpkgs-plugin-update: updated naming policy; vimPlugins: update on 2025-12-12 nixpkgs-plugin-update: updated plugin versioning; vimPlugins: update on 2025-12-15 Dec 15, 2025
@khaneliman
Copy link
Contributor Author

khaneliman commented Dec 15, 2025

Thanks!

Although, first commit message seems wrong, and all the vimPlugins: update should be squashed

You're right, squashed and renamed.

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Dec 15, 2025
@khaneliman
nixpkgs-plugin-update: updated plugin versioning
a7e6b10 
Match current standards for versioning packages in nixpkgs.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
@khaneliman
vimPlugins: update on 2025-12-15
0f372a0 
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
@khaneliman
vimPlugins: resolve github repository redirects
1c62755 
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
@khaneliman
nixpkgs-plugin-update: ruff format
4a660f8 
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
@MattSturgeon MattSturgeon added this pull request to the merge queue Dec 15, 2025
GaetanLepage
GaetanLepage approved these changes Dec 15, 2025
View reviewed changes
Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

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

Thanks @khaneliman!

Merged via the queue into NixOS:master with commit 96f4806 Dec 15, 2025
27 of 30 checks passed
@khaneliman khaneliman deleted the vim-updater-tweaks branch December 15, 2025 18:09
@khaneliman khaneliman mentioned this pull request Dec 16, 2025
Merged
13 tasks
@PerchunPak
Copy link
Member

PerchunPak commented Dec 16, 2025

I just realized that version fetching here does not work when there is no token (GraphQL API requires a token). This is the case when people want to add only a single plugin, and it doesn't use the API that much to need a token. I just tested it, and it will set the version to 0-unstable, then it will be rewritten during the full vimPlugins update.

@khaneliman
Copy link
Contributor Author

khaneliman commented Dec 16, 2025 •
edited
Loading

I just realized that version fetching here does not work when there is no token (GraphQL API requires a token). This is the case when people want to add only a single plugin, and it doesn't use the API that much to need a token. I just tested it, and it will set the version to 0-unstable, then it will be rewritten during the full vimPlugins update.

Blah that's kinda annoying. Could just fallback to using the git ls-remote approach when no token is provided

@khaneliman khaneliman mentioned this pull request Dec 16, 2025
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MattSturgeon MattSturgeon MattSturgeon left review comments

@GaetanLepage GaetanLepage GaetanLepage approved these changes

@mrcjkb mrcjkb Awaiting requested review from mrcjkb

@teto teto Awaiting requested review from teto

+1 more reviewer

@PerchunPak PerchunPak PerchunPak approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 6.topic: vim Advanced text editor 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 2 This PR was reviewed and approved by two persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@khaneliman @MattSturgeon @GaetanLepage @PerchunPak