diff options
Diffstat (limited to 'pkgs/applications/editors')
4 files changed, 26 insertions, 102 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index b85128816aa61..944fc6c49463b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -16,7 +16,7 @@ }: let - rev = "4bfbbe4e6c44d80b15cb501fa3444ad03dba2824"; + rev = "9e88e660d717ba597d9fe9366cf4278674734410"; python = python3.withPackages (ps: with ps; [ epc orjson @@ -28,13 +28,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "20240622.236"; + version = "20240629.1404"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - hash = "sha256-rzaUtUYDEZAuRjSgThHKxrQ7U8ZIO0k750aH08VpA08="; + hash = "sha256-qpetTKZDQjoofp8ggothYALQBpwLjuNxCq46Pe4oZZA="; }; commit = rev; diff --git a/pkgs/applications/editors/neovim/neovim-gtk.nix b/pkgs/applications/editors/neovim/neovim-gtk.nix deleted file mode 100644 index eebb980f85cb5..0000000000000 --- a/pkgs/applications/editors/neovim/neovim-gtk.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, wrapGAppsHook4 -, pkg-config -, gdk-pixbuf -, gtk4 -, pango -, vte-gtk4 -}: - -rustPlatform.buildRustPackage rec { - pname = "neovim-gtk"; - version = "1.0.4"; - - src = fetchFromGitHub { - owner = "Lyude"; - repo = pname; - rev = "v${version}"; - hash = "sha256-inva7pYwOw3bXvFeKZ4aKSQ65iCat5HxM+NME8jN4/I="; - }; - - cargoHash = "sha256-9eZwCOP4xQtFOieqVRBAdXZrXmzdnae6PexGJ/eCyYc="; - - nativeBuildInputs = [ wrapGAppsHook4 pkg-config ]; - - buildInputs = [ gdk-pixbuf gtk4 pango vte-gtk4 ]; - - postInstall = '' - make PREFIX=$out install-resources - ''; - - meta = with lib; { - description = "Gtk ui for neovim"; - homepage = "https://github.com/Lyude/neovim-gtk"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ aleksana ]; - mainProgram = "nvim-gtk"; - }; -} diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix deleted file mode 100644 index f85d379faa85c..0000000000000 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -, neovim -, fetchpatch -}: - -with python3.pkgs; buildPythonApplication rec { - pname = "neovim-remote"; - version = "2.5.1"; - - src = fetchFromGitHub { - owner = "mhinz"; - repo = "neovim-remote"; - rev = "v${version}"; - sha256 = "0lbz4w8hgxsw4k1pxafrl3rhydrvi5jc6vnsmkvnhh6l6rxlmvmq"; - }; - - patches = [ - # Fix a compatibility issue with neovim 0.8.0 - (fetchpatch { - url = "https://github.com/mhinz/neovim-remote/commit/56d2a4097f4b639a16902390d9bdd8d1350f948c.patch"; - hash = "sha256-/PjE+9yfHtOUEp3xBaobzRM8Eo2wqOhnF1Es7SIdxvM="; - }) - ]; - - propagatedBuildInputs = [ - pynvim - psutil - setuptools - ]; - - nativeCheckInputs = [ - neovim - pytestCheckHook - ]; - - doCheck = !stdenv.isDarwin; - - preCheck = '' - export HOME="$(mktemp -d)" - ''; - - meta = with lib; { - description = "Tool that helps controlling nvim processes from a terminal"; - homepage = "https://github.com/mhinz/neovim-remote/"; - license = licenses.mit; - maintainers = with maintainers; [ edanaher ]; - platforms = platforms.unix; - mainProgram = "nvr"; - }; -} diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 8f9a5b880032c..438c9904829c6 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -7,7 +7,6 @@ , ruby , lua , python3Packages -, writeText , wrapNeovimUnstable , runCommand }: @@ -78,7 +77,7 @@ let ++ (extraPython3Packages ps) ++ (lib.concatMap (f: f ps) pluginPython3Packages)); - luaEnv = neovim-unwrapped.lua.withPackages(extraLuaPackages); + luaEnv = neovim-unwrapped.lua.withPackages extraLuaPackages; # as expected by packdir packpathDirs.myNeovimPackages = myVimPackage; @@ -101,13 +100,13 @@ let "--prefix" "LUA_CPATH" ";" (neovim-unwrapped.lua.pkgs.luaLib.genLuaCPathAbsStr luaEnv) ]; - manifestRc = vimUtils.vimrcContent ({ customRC = ""; }) ; + manifestRc = vimUtils.vimrcContent { customRC = ""; }; # we call vimrcContent without 'packages' to avoid the init.vim generation - neovimRcContent = vimUtils.vimrcContent ({ + neovimRcContent = vimUtils.vimrcContent { beforePlugins = ""; customRC = lib.concatStringsSep "\n" (pluginRC ++ [customRC]); packages = null; - }); + }; in builtins.removeAttrs args ["plugins"] // { @@ -225,8 +224,25 @@ let } // grammar.meta; } '' - mkdir -p $out/parser - ln -s ${grammar}/parser $out/parser/${name}.so + mkdir -p "$out/parser" + ln -s "${grammar}/parser" "$out/parser/${name}.so" + + mkdir -p "$out/queries/${name}" + if [ -d "${grammar}/queries/${name}" ]; then + echo "moving queries from neovim queries dir" + for file in "${grammar}/queries/${name}"*; do + ln -s "$file" "$out/queries/${name}/$(basename "$file")" + done + else + if [ -d "${grammar}/queries" ]; then + echo "moving queries from standard queries dir" + for file in "${grammar}/queries/"*; do + ln -s "$file" "$out/queries/${name}/$(basename "$file")" + done + else + echo "missing queries for ${name}" + fi + fi ''); in |