Merge branch 'v0.8' into feature/transparent-base16

This commit is contained in:
Some Guy 2025-11-27 21:32:21 -07:00 committed by GitHub
commit 64cbdafe35
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 53 additions and 15 deletions

View file

@ -405,7 +405,7 @@
[aionoid](https://github.com/aionoid): [aionoid](https://github.com/aionoid):
[avante-nvim]: https://github.com/yetone/avante.nvim [avante.nvim]: https://github.com/yetone/avante.nvim
- Fix [render-markdown.nvim] file_types option type to list, to accept merging. - Fix [render-markdown.nvim] file_types option type to list, to accept merging.
- Add [avante.nvim] plugin under `vim.assistant.avante-nvim`. - Add [avante.nvim] plugin under `vim.assistant.avante-nvim`.
@ -581,6 +581,14 @@
[typst-concealer]: https://github.com/PartyWumpus/typst-concealer [typst-concealer]: https://github.com/PartyWumpus/typst-concealer
- Add inline typst concealing support under `vim.languages.typst` using - Add inline typst concealing support under `vim.languages.typst` using
[typst-concealer].
[KrappRamiro](https://github.com/KrappRamiro):
[phaazon/hop.nvim]: https://github.com/hadronized/hop.nvim
[smoka7/hop.nvim]: https://github.com/smoka7/hop.nvim
- Migrate [phaazon/hop.nvim] to [smoka7/hop.nvim]
[typst-concealer]. [simon-wg](https://github.com/simon-wg): [typst-concealer]. [simon-wg](https://github.com/simon-wg):
- Update `python` language module to use correct lsp binary. - Update `python` language module to use correct lsp binary.

View file

@ -1,4 +1,5 @@
{ {
lib,
pins, pins,
openssl, openssl,
pkg-config, pkg-config,
@ -11,6 +12,8 @@
}: let }: let
# From npins # From npins
pin = pins.avante-nvim; pin = pins.avante-nvim;
pname = "avante-nvim-lib";
version = pin.branch; version = pin.branch;
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
inherit (pin.repository) owner repo; inherit (pin.repository) owner repo;
@ -19,8 +22,7 @@
}; };
avante-nvim-lib = rustPlatform.buildRustPackage { avante-nvim-lib = rustPlatform.buildRustPackage {
pname = "avante-nvim-lib"; inherit pname version src;
inherit version src;
cargoHash = "sha256-pTWCT2s820mjnfTscFnoSKC37RE7DAPKxP71QuM+JXQ="; cargoHash = "sha256-pTWCT2s820mjnfTscFnoSKC37RE7DAPKxP71QuM+JXQ=";
@ -43,6 +45,8 @@
"--skip=test_roundtrip" "--skip=test_roundtrip"
"--skip=test_fetch_md" "--skip=test_fetch_md"
]; ];
env.RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
}; };
in in
vimUtils.buildVimPlugin { vimUtils.buildVimPlugin {
@ -64,7 +68,15 @@ in
# Requires setup with corresponding provider # Requires setup with corresponding provider
"avante.providers.azure" "avante.providers.azure"
"avante.providers.copilot" "avante.providers.copilot"
"avante.providers.vertex_claude" "avante.providers.gemini"
"avante.providers.ollama" "avante.providers.ollama"
"avante.providers.vertex"
"avante.providers.vertex_claude"
]; ];
meta = {
description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE";
homepage = "https://github.com/yetone/avante.nvim";
license = lib.licenses.asl20;
};
} }

View file

@ -1,17 +1,19 @@
{ {
lib,
stdenv,
rustPlatform, rustPlatform,
fetchFromGitHub, fetchFromGitHub,
writeShellScriptBin, writeShellScriptBin,
}: }:
rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.buildRustPackage (finalAttrs: {
pname = "blink-cmp"; pname = "blink-cmp";
version = "1.6.0"; version = "1.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Saghen"; owner = "Saghen";
repo = "blink.cmp"; repo = "blink.cmp";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-IHRYgKcYP+JDGu8Vtawgzlhq25vpROFqb8KmpfVMwCk="; hash = "sha256-JjlcPj7v9J+v1SDBYIub6jFEslLhZGHmsipV1atUAFo=";
}; };
forceShare = [ forceShare = [
@ -29,11 +31,24 @@ rustPlatform.buildRustPackage (finalAttrs: {
mv "$out/lib" "$out/target/release" mv "$out/lib" "$out/target/release"
''; '';
cargoHash = "sha256-QsVCugYWRri4qu64wHnbJQZBhy4tQrr+gCYbXtRBlqE="; cargoHash = "sha256-Qdt8O7IGj2HySb1jxsv3m33ZxJg96Ckw26oTEEyQjfs=";
nativeBuildInputs = [ nativeBuildInputs = [
(writeShellScriptBin "git" "exit 1") (writeShellScriptBin "git" "exit 1")
]; ];
env.RUSTC_BOOTSTRAP = true; env = {
RUSTC_BOOTSTRAP = true;
# Those are the Linker args used by upstream. Without those, the build fails.
# See:
# <https://github.com/saghen/blink.cmp/blob/main/.cargo/config.toml#L1C1-L11C2>
RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
};
meta = {
description = "Performant, batteries-included completion plugin for Neovim";
homepage = "https://github.com/saghen/blink.cmp";
changelog = "https://github.com/Saghen/blink.cmp/blob/v${finalAttrs.version}/CHANGELOG.md";
};
}) })

View file

@ -721,18 +721,21 @@
"url": "https://github.com/tzachar/highlight-undo.nvim/archive/ee32e12693d70e66f954d09a504a7371d110fc27.tar.gz", "url": "https://github.com/tzachar/highlight-undo.nvim/archive/ee32e12693d70e66f954d09a504a7371d110fc27.tar.gz",
"hash": "09byybwyl61jxlfii9vsi4i21vy6ngm3mbypqlhsivn8wgg24kn9" "hash": "09byybwyl61jxlfii9vsi4i21vy6ngm3mbypqlhsivn8wgg24kn9"
}, },
"hop-nvim": { "hop.nvim": {
"type": "Git", "type": "GitRelease",
"repository": { "repository": {
"type": "GitHub", "type": "GitHub",
"owner": "phaazon", "owner": "smoka7",
"repo": "hop.nvim" "repo": "hop.nvim"
}, },
"branch": "master", "pre_releases": false,
"version_upper_bound": null,
"release_prefix": null,
"submodules": false, "submodules": false,
"revision": "1a1eceafe54b5081eae4cb91c723abd1d450f34b", "version": "v2.7.2",
"url": "https://github.com/phaazon/hop.nvim/archive/1a1eceafe54b5081eae4cb91c723abd1d450f34b.tar.gz", "revision": "08ddca799089ab96a6d1763db0b8adc5320bf050",
"hash": "08h18cam2yr57qvfsnf1bra28vbl6013wlchnr5crb757xw8aysa" "url": "https://api.github.com/repos/smoka7/hop.nvim/tarball/v2.7.2",
"hash": "07mydcm3x7xc7x6wg5l6kcx8yrrv9bwy2p44y17ajyx37c5lmwwn"
}, },
"hunk-nvim": { "hunk-nvim": {
"type": "GitRelease", "type": "GitRelease",