feat: move neovim flake into the overlay itself #483
Conversation
| @@ -6,7 +6,7 @@ | |||
| flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; }; | |||
| hercules-ci-effects = { url = "github:hercules-ci/hercules-ci-effects"; inputs.nixpkgs.follows = "nixpkgs"; }; | |||
| flake-compat = { url = "github:edolstra/flake-compat"; flake = false; }; | |||
| neovim-flake = { url = "github:neovim/neovim?dir=contrib"; inputs.nixpkgs.follows = "nixpkgs"; }; | |||
| neovim-flake = { url = "path:./neovim"; inputs.nixpkgs.follows = "nixpkgs"; }; | |||
There was a problem hiding this comment.
I get a `cannot fetch path because it uses a relative path. I believe we should just keep this flake and merge neovim's one into it (whcih could also import *.nix files)
There was a problem hiding this comment.
Man I tested this when I put it up and swear I didn't get this error 😆 Thanks for pointing this out, I will merge the two 👍
|
thanks for doing this ! It's very much appreciated. |
|
Apologies: @teto I might need some guidance from you on this. When trying to merge the two flakes my lack of nix knowledge began showing and I was unable to resolve the errors after quite some trying. I'll keep on it today but maybe in the meantime maybe I can just make a PR to update the dependency in the neovim repo? EDIT: I think the current unstable version of nixpkgs also has the out-of-date version of tree-sitter (0.22.5) so it will need to be bumped there first so we can update the flake input here (or in the neovim repo) |
It does not work and we don't plan on maintaining these anymore. The flake files are being moved to nix-community/neovim-nightly-overlay#483 instead.
|
@ribru17 I just moved off of neovim/neovim?dir=contrib so if you need a reference you can check out: willruggiano/neovim.drv@f16c01d#diff-e126406cafda4a612d447ad20677962966b4f61764ea252c7c932b244e7d5cd3 Note that this also uses the versions specified in deps.txt for a few other dependencies: gettext, libiconv, libuv, libvterm-neovim, msgpack-c and tree-sitter. So your comment above about the outdated tree-sitter version is resolved by this method. |
|
Thank you, this is amazing!! I will try and integrate a minimal version of it here. |
No problem. Feel free to @ me if you need any help. |
|
@ribru17 I will start doing it myself in a few hours if you dont beat me to it. Neovim core contributors are (rightfully) tired of dealing with nix issues and I've made them wait too long. I've got a window of opportunity in a few hours. |
|
Thank you @teto, I appreciate your work. I've definitely bitten off more than I can chew with this one :/ Apologies if I led anyone on with this one, I definitely had higher confidence in myself in the beginning stages of this PR... |
|
finally done in #516 . Sry for the trouble |
Attempts to move the Neovim nix flake into this overlay. See neovim/neovim#28305 (comment). I'm marking this as draft because I am not confident enough in my Nix knowledge, but in my local testing this seemed to work well. The sub-flake importing followed solutions discussed in NixOS/nix#3978, though it has its caveats as mentioned over there. Still, I think this may be a fine solution, and I will try to be quick to amend the PR if anything needs a change 👍
EDIT: I think this is ready for review. It seems to work fine in my configuration. And I believe the drawbacks mentioned above are not applicable here.
Note that the flake copied over here differs slightly from the original Neovim flake in that it pulls in
because it obviously can no longer use relative paths to access the files in the repo.