diff --git a/flake.lock b/flake.lock index 9221f43f..c1cda841 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "blink-cmp": { - "flake": false, - "locked": { - "lastModified": 1739129359, - "narHash": "sha256-nUrXXiJ7NRxS21H53U323lwEKdo08Y011l8XskXC/vw=", - "owner": "saghen", - "repo": "blink.cmp", - "rev": "b2485c76cb7877de6fe9c8670af59ba3d72fd74d", - "type": "github" - }, - "original": { - "owner": "saghen", - "repo": "blink.cmp", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -137,7 +121,6 @@ }, "root": { "inputs": { - "blink-cmp": "blink-cmp", "flake-parts": "flake-parts", "flake-utils": "flake-utils", "mnw": "mnw", diff --git a/flake.nix b/flake.nix index 1c559bd7..acef6382 100644 --- a/flake.nix +++ b/flake.nix @@ -98,10 +98,5 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; - - blink-cmp = { - url = "github:saghen/blink.cmp"; - flake = false; - }; }; } diff --git a/flake/legacyPackages.nix b/flake/legacyPackages.nix index d5b5aacd..33aee0e3 100644 --- a/flake/legacyPackages.nix +++ b/flake/legacyPackages.nix @@ -1,4 +1,8 @@ -{inputs, ...}: { +{ + inputs, + self, + ... +}: { perSystem = { system, inputs', @@ -9,14 +13,21 @@ overlays = [ inputs.self.overlays.default - (final: _: { + (final: prev: { # Build nil from source to get most recent # features as they are added. nil = inputs'.nil.packages.default; - blink-cmp = final.callPackage ./legacyPackages/blink-cmp.nix { - src = inputs.blink-cmp; - version = inputs.blink-cmp.shortRev or inputs.blink-cmp.shortDirtyRev or "dirty"; - }; + blink-cmp = let + pin = self.pins.blink-cmp; + in + final.callPackage ./legacyPackages/blink-cmp.nix { + inherit (pin) version; + src = prev.fetchFromGitHub { + inherit (pin.repository) owner repo; + rev = pin.revision; + sha256 = pin.hash; + }; + }; }) ]; }; diff --git a/flake/legacyPackages/blink-cmp.nix b/flake/legacyPackages/blink-cmp.nix index 002269b9..924cb4cc 100644 --- a/flake/legacyPackages/blink-cmp.nix +++ b/flake/legacyPackages/blink-cmp.nix @@ -10,16 +10,16 @@ pname = "blink-fuzzy-lib"; inherit version src; - env = { - # TODO: remove this if plugin stops using nightly rust - RUSTC_BOOTSTRAP = true; - }; + # TODO: remove this if plugin stops using nightly rust + env.RUSTC_BOOTSTRAP = true; + nativeBuildInputs = [git]; cargoLock = { lockFile = "${src}/Cargo.lock"; allowBuiltinFetchGit = true; }; }; + libExt = if hostPlatform.isDarwin then "dylib" diff --git a/npins/sources.json b/npins/sources.json index 929da85c..2bcda9ea 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -36,6 +36,21 @@ "url": "https://github.com/rrethy/base16-nvim/archive/6ac181b5733518040a33017dde654059cd771b7c.tar.gz", "hash": "0q47jbh6abn2hql9ghi9ayx3l8pdrdcdrnf4qfk7cp0v1bl7y48r" }, + "blink-cmp": { + "type": "GitRelease", + "repository": { + "type": "GitHub", + "owner": "saghen", + "repo": "blink.cmp" + }, + "pre_releases": false, + "version_upper_bound": null, + "release_prefix": null, + "version": "v0.11.0", + "revision": "7a70199efe4e333a3693ba3e56ddbec3b9c9c330", + "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v0.11.0", + "hash": "1j3sj03i72iw5npwwksc7w7axv8z0nbgi11adkfng9ak73kn1gdq" + }, "blink-compat": { "type": "Git", "repository": {