on master help sign in
Use fromTOML on Nix >= 2.6.0 (#1892)
4eed4c2Max
grammars.nix+4−2
@@ -5,8 +5,10 @@ let
5 languages-json = runCommand "languages-toml-to-json" { } ''
5 languages-json = runCommand "languages-toml-to-json" { } ''
6 ${yj}/bin/yj -t < ${./languages.toml} > $out
6 ${yj}/bin/yj -t < ${./languages.toml} > $out
7 '';
7 '';
8− languagesConfig =
8+ languagesConfig = if lib.versionAtLeast builtins.nixVersion "2.6.0" then
9+ builtins.fromTOML (builtins.readFile ./languages.toml)
10+ else
9− builtins.fromJSON (builtins.readFile (builtins.toPath languages-json));
11+ builtins.fromJSON (builtins.readFile (builtins.toPath languages-json));
10 isGitGrammar = (grammar:
12 isGitGrammar = (grammar:
11 builtins.hasAttr "source" grammar && builtins.hasAttr "git" grammar.source
13 builtins.hasAttr "source" grammar && builtins.hasAttr "git" grammar.source
12 && builtins.hasAttr "rev" grammar.source);
14 && builtins.hasAttr "rev" grammar.source);