diff options
author | ivanbrennan <ivan.brennan@gmail.com> | 2023-01-08 16:05:49 -0500 |
---|---|---|
committer | ivanbrennan <ivan.brennan@gmail.com> | 2023-01-08 16:15:56 -0500 |
commit | 418fda2293cd70c343a0299c5cca39b61e3fb4cc (patch) | |
tree | a9e6270b8a25e9ee67c56244fc74f73e1a5dc1b7 | |
parent | 04f574a1c0fde90b51bf68198e2297ca4e7cccf4 (diff) |
nixos.programs.neovim: fix runtime
When this module was first introduced, it processed the runtime option
in a way that nested the resulting files and directories under an etc
directory.
https://github.com/NixOS/nixpkgs/pull/98506/files#diff-685092dbb1852fbf30857fe3505d25dc471dc79d0f31c466523b5f5822b68127R11-R21
That implementation relied on nixos/modules/system/etc/make-etc.sh, a
script that was later removed.
https://github.com/NixOS/nixpkgs/pull/131102/commits/eb7120dc79966d5ed168321fd213de38de13a2b1
The implementation was updated to use linkFarm, which changed the
behavior slightly, in that the configured files and directories are no
longer automatically nested under an etc directory.
https://github.com/NixOS/nixpkgs/commit/307b1253a797f9ab9f5da38a470099945ea7ce04
But the module still configures neovim's runtimepath in a way that
assumes the old nesting behavior.
https://github.com/NixOS/nixpkgs/blob/04f574a1c0fde90b51bf68198e2297ca4e7cccf4/nixos/modules/programs/neovim.nix#L173
Restore the original behavior, nesting runtime files and directories
under an etc directory.
-rw-r--r-- | nixos/modules/programs/neovim.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/programs/neovim.nix b/nixos/modules/programs/neovim.nix index 8de527fceb26..4562e5a2c29b 100644 --- a/nixos/modules/programs/neovim.nix +++ b/nixos/modules/programs/neovim.nix @@ -7,7 +7,7 @@ let runtime' = filter (f: f.enable) (attrValues cfg.runtime); - runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = x.target; path = x.source; }) runtime'); + runtime = pkgs.linkFarm "neovim-runtime" (map (x: { name = "etc/${x.target}"; path = x.source; }) runtime'); in { options.programs.neovim = { |