diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 92a755e4da6c..5283c7c6c3d9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -375,19 +375,7 @@ let knownTreeSitterOrgGrammarRepos); in - mergeAttrsUnique otherGrammars treeSitterOrgaGrammars; - - # TODO: move to lib - mergeAttrsUnique = left: right: - let intersect = lib.intersectLists (lib.attrNames left) (lib.attrNames right); in - assert - lib.assertMsg (intersect == [ ]) - (lib.concatStringsSep "\n" [ - "mergeAttrsUnique: keys in attrset overlapping:" - "left: ${lib.generators.toPretty {} (lib.getAttrs intersect left)}" - "right: ${lib.generators.toPretty {} (lib.getAttrs intersect right)}" - ]); - left // right; + lib.attrsets.unionOfDisjoint otherGrammars treeSitterOrgaGrammars;