pkgs: use upstream kak-tree-sitter
This commit is contained in:
		
							parent
							
								
									bd46b5610b
								
							
						
					
					
						commit
						0f14332471
					
				
					 4 changed files with 2 additions and 37 deletions
				
			
		| 
						 | 
					@ -9,5 +9,4 @@ rec {
 | 
				
			||||||
  emmet-cli = pkgs.callPackage ./emmet-cli.nix { };
 | 
					  emmet-cli = pkgs.callPackage ./emmet-cli.nix { };
 | 
				
			||||||
  material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { };
 | 
					  material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { };
 | 
				
			||||||
  gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { };
 | 
					  gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { };
 | 
				
			||||||
  kak-tree-sitter = pkgs.callPackage ./kak-tree-sitter.nix { };
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,34 +0,0 @@
 | 
				
			||||||
{
 | 
					 | 
				
			||||||
  lib,
 | 
					 | 
				
			||||||
  stdenv,
 | 
					 | 
				
			||||||
  rustPlatform,
 | 
					 | 
				
			||||||
  fetchFromSourcehut,
 | 
					 | 
				
			||||||
  makeWrapper,
 | 
					 | 
				
			||||||
}:
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
rustPlatform.buildRustPackage rec {
 | 
					 | 
				
			||||||
  pname = "kak-tree-sitter";
 | 
					 | 
				
			||||||
  version = "1.1.2";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  src = fetchFromSourcehut {
 | 
					 | 
				
			||||||
    owner = "~hadronized";
 | 
					 | 
				
			||||||
    repo = "kak-tree-sitter";
 | 
					 | 
				
			||||||
    rev = "kak-tree-sitter-v${version}";
 | 
					 | 
				
			||||||
    hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA=";
 | 
					 | 
				
			||||||
  };
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  cargoSha256 = "sha256-OQPUWqJAts8DbFNSsC/CmMCbuZ9TVxRTR05O7oiodKI=";
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  nativeBuildInputs = [ makeWrapper ];
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  postFixup = ''
 | 
					 | 
				
			||||||
    wrapProgram "$out/bin/ktsctl" \
 | 
					 | 
				
			||||||
      --suffix PATH : ${stdenv.cc}
 | 
					 | 
				
			||||||
  '';
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  meta = with lib; {
 | 
					 | 
				
			||||||
    description = "Server that interfaces tree-sitter with kakoune";
 | 
					 | 
				
			||||||
    homepage = "https://git.sr.ht/~hadronized/kak-tree-sitter";
 | 
					 | 
				
			||||||
    license = with licenses; [ mit ];
 | 
					 | 
				
			||||||
  };
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -127,7 +127,7 @@ in
 | 
				
			||||||
      ranger
 | 
					      ranger
 | 
				
			||||||
      bmenu
 | 
					      bmenu
 | 
				
			||||||
      kak-lsp
 | 
					      kak-lsp
 | 
				
			||||||
      kak-tree-sitter
 | 
					      unstable.kak-tree-sitter
 | 
				
			||||||
      kak-pager
 | 
					      kak-pager
 | 
				
			||||||
      kak-man-pager
 | 
					      kak-man-pager
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
{ pkgs, lib, ... }:
 | 
					{ pkgs, lib, ... }:
 | 
				
			||||||
let
 | 
					let
 | 
				
			||||||
  hx-src = pkgs.helix.src;
 | 
					  hx-src = pkgs.helix.src;
 | 
				
			||||||
  kts-src = pkgs.kak-tree-sitter.src;
 | 
					  kts-src = pkgs.unstable.kak-tree-sitter-unwrapped.src;
 | 
				
			||||||
  inherit (pkgs) fetchFromGitHub;
 | 
					  inherit (pkgs) fetchFromGitHub;
 | 
				
			||||||
in
 | 
					in
 | 
				
			||||||
with pkgs.tree-sitter-grammars;
 | 
					with pkgs.tree-sitter-grammars;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue