NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-12-08 05:03:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1253 from NotAShelf/notashelf/push-uolyvpoluszk

Browse source 
{blink-cmp,  avante-nvim}: fix Dawin builds; update blink-cmp
This commit is contained in:
raf 2025-11-28 06:30:41 +03:00 • committed by GitHub
commit 4e4fa6274e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 34 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake/pkgs/by-name/avante-nvim/package.nix
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;
};
} }

23
flake/pkgs/by-name/blink-cmp/package.nix
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";
};
}) })