From cbd756b6a804becd2d202beab21465f9039a667d Mon Sep 17 00:00:00 2001 From: Eman Resu Date: Mon, 20 Jul 2026 09:52:13 -0400 Subject: [PATCH] tree-sitter: partially apply removePrefix calls --- pkgs/by-name/tr/tree-sitter/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/tr/tree-sitter/package.nix b/pkgs/by-name/tr/tree-sitter/package.nix index e63404636c67..4c122fb6b903 100644 --- a/pkgs/by-name/tr/tree-sitter/package.nix +++ b/pkgs/by-name/tr/tree-sitter/package.nix @@ -80,6 +80,10 @@ let name: value: hasTreeSitterPrefix name && lib.isDerivation value ); + removeTreesitterPrefix = lib.strings.removePrefix "tree-sitter-"; + removeGrammarSuffix = lib.strings.removeSuffix "-grammar"; + replaceHyphens = lib.strings.replaceStrings [ "-" ] "_"; + mkGrammarLinkFarm = grammars: linkFarm "grammars" ( @@ -89,11 +93,7 @@ let name = lib.strings.getName drv; in { - name = - (lib.strings.replaceStrings [ "-" ] [ "_" ] ( - lib.strings.removePrefix "tree-sitter-" (lib.strings.removeSuffix "-grammar" name) - )) - + ".so"; + name = (replaceHyphens (removeTreesitterPrefix (removeGrammarSuffix name))) + ".so"; path = "${drv}/parser"; } ) grammars