Merge pull request #206527 from ncfavier/tree-sitter-unionOfDisjoint

Changed files
+1 -13
pkgs
development
tools
parsing
tree-sitter
+1 -13
pkgs/development/tools/parsing/tree-sitter/update.nix
···
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;