Unverified Commit 0e3f7cb5 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

vimPlugins.blink-cmp: remove old patch and use upstream bypass method (#386511)

parents c7ebf0ef d39e23d3

pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/default.nix

+8 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 
  lib,

  rustPlatform,

  fetchFromGitHub,

  fetchpatch,

  stdenv,

  vimUtils,

  nix-update-script,

  git,

  replaceVars,

}:

let

  version = "0.13.1";
@@ -41,10 +41,16 @@ vimUtils.buildVimPlugin { 
    ''

      mkdir -p target/release

      ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy${ext} target/release/libblink_cmp_fuzzy${ext}

      echo -n "nix" > target/release/version

    '';



  # TODO: Remove this patch when updating to next version

  patches = [

    (replaceVars ./force-version.patch { inherit (src) tag; })

    (fetchpatch {

      name = "blink-add-bypass-for-nix.patch";

      url = "https://github.com/Saghen/blink.cmp/commit/6c83ef1ae34abd7ef9a32bfcd9595ac77b61037c.diff?full_index=1";

      hash = "sha256-304F1gDDKVI1nXRvvQ0T1xBN+kHr3jdmwMMp8CNl+GU=";

    })

  ];



  passthru = {

pkgs/applications/editors/vim/plugins/non-generated/blink-cmp/force-version.patch

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
--- a/lua/blink/cmp/fuzzy/download/init.lua

+++ b/lua/blink/cmp/fuzzy/download/init.lua

@@ -21,7 +21,7 @@ function download.ensure_downloaded(callback)

       }

     end)

     :map(function(version)

-      local target_git_tag = download_config.force_version or version.git.tag

+      local target_git_tag = download_config.force_version or '@tag@'



       -- not built locally, not on a git tag, error

       assert(