diff options
author | toastal <561087+toastal@users.noreply.github.com> | 2022-11-18 16:44:44 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-18 11:44:44 -0500 |
commit | a79542fa48ef98d5b5202f6be1a0c2cf975e4e7b (patch) | |
tree | 9b81897b20b0b29db356879b2c9980f45d4c170d /pkgs/applications/editors | |
parent | a700962b7317171950234f67b4aeeae8e554d5e6 (diff) |
vimPlugins.himalaya-vim: fix source due to repo split (#195927)
Previously the Vim plugin was a part of the main repository, but the author has elected to split out the project and move away from GitHub to an open source Git forge @ https://git.sr.ht/~soywod/himalaya-vim/ As such, the previous plugin is currently broken, but now it can be updated indepentently. Co-authored-by: figsoda <figsoda@pm.me>
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/vim/plugins/generated.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/editors/vim/plugins/overrides.nix | 18 | ||||
-rw-r--r-- | pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 |
3 files changed, 18 insertions, 12 deletions
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 0d5fa1bcd314a..e79797471a8b5 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3501,6 +3501,17 @@ final: prev: meta.homepage = "https://github.com/travitch/hasksyn/"; }; + himalaya-vim = buildVimPluginFrom2Nix { + pname = "himalaya-vim"; + version = "2022-10-10"; + src = fetchgit { + url = "https://git.sr.ht/~soywod/himalaya-vim"; + rev = "747ff2a6055839cb5b403b540883515af37b7117"; + sha256 = "sha256-0WP9JoKN/A5bmnRjQJnquk3mRC7NEflUAdqki7+zqBU="; + }; + meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; + }; + hiPairs = buildVimPluginFrom2Nix { pname = "hiPairs"; version = "2020-12-10"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 9330377601cf7..d821dea94917a 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -471,20 +471,14 @@ self: super: { dependencies = with self; [ lush-nvim ]; }); - himalaya-vim = buildVimPluginFrom2Nix { - pname = "himalaya-vim"; - inherit (himalaya) src version; - dependencies = with self; [ himalaya ]; - configurePhase = '' - cd vim + himalaya-vim = super.himalaya-vim.overrideAttrs (old: { + postPatch = '' substituteInPlace plugin/himalaya.vim \ - --replace 'if !executable("himalaya")' 'if v:false' - ''; - postFixup = '' - mkdir -p $out/bin - ln -s ${himalaya}/bin/himalaya $out/bin/himalaya + --replace "if !executable('himalaya')" "if v:false" + substituteInPlace autoload/himalaya/request.vim \ + --replace "'himalaya" "'${himalaya}/bin/himalaya" ''; - }; + }); jedi-vim = super.jedi-vim.overrideAttrs (old: { # checking for python3 support in vim would be neat, too, but nobody else seems to care diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4b99d9d2b144e..8e9bb27161d17 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -293,6 +293,7 @@ https://github.com/MrcJkb/haskell-tools.nvim/,HEAD, https://github.com/neovimhaskell/haskell-vim/,, https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, https://github.com/travitch/hasksyn/,, +https://git.sr.ht/~soywod/himalaya-vim,, https://github.com/Yggdroot/hiPairs/,, https://github.com/mpickering/hlint-refactor-vim/,, https://github.com/edluffy/hologram.nvim/,, |