Conflicts in luaPackages.luarocks-nix:
- 8b563cd9f9 switched to the new version format (prefixed by 0 since there was no relevant last tag in the branch).
bc4f6fa543 bumped version and switched to the new version format. But the tag used is not part of the branch the commit comes from (master).
Used the new version but replaced the tag prefix with 0.
- b73ec84b9e removed meta (it is already set in the overridden luarocks). But that would cause the update script to try to update the overridden luarocks (as did the previously used old.meta).
bf311d950e modified meta to fix the update script properly.
Kept the meta from the latter since it allows update script to work.
This was achieved using the following command:
sd 'wrapGAppsHook\b' wrapGAppsHook3 (rg -l 'wrapGAppsHook\b')
And then manually reverted the following changes:
- alias in top-level.nix
- function name in wrap-gapps-hook.sh
- comment in postFixup of at-spi2-core
- comment in gtk4
- comment in preFixup of 1password-gui/linux.nix
- comment in postFixup of qgis/unwrapped-ltr.nix and qgis/unwrapped.nix
- comment in postFixup of telegram-desktop
- comment in postFixup of fwupd
- buildCommand of mongodb-compass
- postFixup of xflux-gui
- comment in a patch in kdePackages.kde-gtk-config and plasma5Packages.kde-gtk-config
- description of programs.sway.wrapperFeatures.gtk NixOS option (manual rebuild)
* vimPlugins.nvim-dbee: init at 2024-01-13
nvim-dbee looks for the go binary in paths returned bu M.dir() and M.bin() defined in lua/dbee/install/init.lua
If we patch this path then it should be ok
* Update pkgs/applications/editors/vim/plugins/overrides.nix
Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
---------
Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
Neovim plugins built with buildNeovimPlugin are based on derivations
from the lua package set, ie., they are a flat-install (no share/lua/5.1
nesting) with some post-processing.
While debugging, I noticed their name lacked the vimplugin prefix,
making them a bit harder to diagnose if the derivation was the vimplugin
or not.
So I hardcoded 'namePrefix' (why let the user change that ?) and moved
it to toVimPlugin so it applies to lua-based plugins as well.
Before this PR:
➜ nix-build -A vimPlugins.plenary-nvim
/nix/store/zyvdf7c1k4q2ykg6jydpf5c31g9j921s-lua5.1-plenary.nvim-scm-1-unstable-2024-03-25
After this PR
➜ nix-build -A vimPlugins.plenary-nvim
/nix/store/dy4rjzjbhshi109i6969f39vd9xbjgs1-vimplugin-lua5.1-plenary.nvim-scm-1-unstable-2024-03-25
