Unverified Commit ef9a26b1 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents d60fe3fb 9e09ce2d

maintainers/maintainer-list.nix

+8 −0
Original line number Diff line number Diff line
@@ -10335,6 +10335,14 @@ 
    githubId = 938744;

    name = "John Chadwick";

  };

  jcollie = {

    email = "jeff@ocjtech.us";

    github = "jcollie";

    githubId = 740022;

    matrix = "@jeff:ocjtech.us";

    name = "Jeffrey C. Ollie";

    keys = [ { fingerprint = "A8CF 5B72 ABC3 9A17 3FEA  620E 6F86 035A 6D97 044E"; } ];

  };

  jcouyang = {

    email = "oyanglulu@gmail.com";

    github = "jcouyang";

nixos/modules/config/terminfo.nix

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
          alacritty

          contour

          foot

          ghostty

          kitty

          mtm

          rio

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

+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
  vimUtils,

  nix-update-script,

  git,

  replaceVars,

}:

let

  version = "0.8.2";
@@ -39,6 +40,10 @@ vimUtils.buildVimPlugin { 
    ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.${libExt} target/release/libblink_cmp_fuzzy.${libExt}

  '';



  patches = [

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

  ];



  passthru = {

    updateScript = nix-update-script {

      attrPath = "vimPlugins.blink-cmp.blink-fuzzy-lib";

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

0 → 100644
+11 −0
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(

pkgs/applications/terminal-emulators/kitty/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -35,14 +35,14 @@ 
with python3Packages;

buildPythonApplication rec {

  pname = "kitty";

  version = "0.38.0";

  version = "0.38.1";

  format = "other";



  src = fetchFromGitHub {

    owner = "kovidgoyal";

    repo = "kitty";

    rev = "refs/tags/v${version}";

    hash = "sha256-XURoUYo0Nejcfi49s9AlyoG5fpE0/mjMke2UWG8lUiA=";

    hash = "sha256-0M4Bvhh3j9vPedE/d+8zaiZdET4mXcrSNUgLllhaPJw=";

  };



  goModules = (buildGo123Module {