mirror of
https://github.com/NotAShelf/nvf.git
synced 2025-12-08 05:03:52 +00:00
Merge pull request #1253 from NotAShelf/notashelf/push-uolyvpoluszk
{blink-cmp, avante-nvim}: fix Dawin builds; update blink-cmp
This commit is contained in:
commit
4e4fa6274e
2 changed files with 34 additions and 7 deletions
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
lib,
|
||||
pins,
|
||||
openssl,
|
||||
pkg-config,
|
||||
|
|
@ -11,6 +12,8 @@
|
|||
}: let
|
||||
# From npins
|
||||
pin = pins.avante-nvim;
|
||||
|
||||
pname = "avante-nvim-lib";
|
||||
version = pin.branch;
|
||||
src = pkgs.fetchFromGitHub {
|
||||
inherit (pin.repository) owner repo;
|
||||
|
|
@ -19,8 +22,7 @@
|
|||
};
|
||||
|
||||
avante-nvim-lib = rustPlatform.buildRustPackage {
|
||||
pname = "avante-nvim-lib";
|
||||
inherit version src;
|
||||
inherit pname version src;
|
||||
|
||||
cargoHash = "sha256-pTWCT2s820mjnfTscFnoSKC37RE7DAPKxP71QuM+JXQ=";
|
||||
|
||||
|
|
@ -43,6 +45,8 @@
|
|||
"--skip=test_roundtrip"
|
||||
"--skip=test_fetch_md"
|
||||
];
|
||||
|
||||
env.RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
|
||||
};
|
||||
in
|
||||
vimUtils.buildVimPlugin {
|
||||
|
|
@ -64,7 +68,15 @@ in
|
|||
# Requires setup with corresponding provider
|
||||
"avante.providers.azure"
|
||||
"avante.providers.copilot"
|
||||
"avante.providers.vertex_claude"
|
||||
"avante.providers.gemini"
|
||||
"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;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,19 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
writeShellScriptBin,
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "blink-cmp";
|
||||
version = "1.6.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Saghen";
|
||||
repo = "blink.cmp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-IHRYgKcYP+JDGu8Vtawgzlhq25vpROFqb8KmpfVMwCk=";
|
||||
hash = "sha256-JjlcPj7v9J+v1SDBYIub6jFEslLhZGHmsipV1atUAFo=";
|
||||
};
|
||||
|
||||
forceShare = [
|
||||
|
|
@ -29,11 +31,24 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
|||
mv "$out/lib" "$out/target/release"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-QsVCugYWRri4qu64wHnbJQZBhy4tQrr+gCYbXtRBlqE=";
|
||||
cargoHash = "sha256-Qdt8O7IGj2HySb1jxsv3m33ZxJg96Ckw26oTEEyQjfs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
(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";
|
||||
};
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue