Use fromTOML on Nix >= 2.6.0 (#1892)
commit4eed4c26e9f72a586f9175c4976d80ba091086e6
authorMax <max@privatevoid.net>
dateWed 30 Mar 2022, 18:28 (5 years ago)
parent58758fe
grammars.nix+4−2
@@ -5,8 +5,10 @@ let
55 languages-json = runCommand "languages-toml-to-json" { } ''
66 ${yj}/bin/yj -t < ${./languages.toml} > $out
77 '';
8− languagesConfig =
9− builtins.fromJSON (builtins.readFile (builtins.toPath languages-json));
8+ languagesConfig = if lib.versionAtLeast builtins.nixVersion "2.6.0" then
9+ builtins.fromTOML (builtins.readFile ./languages.toml)
10+ else
11+ builtins.fromJSON (builtins.readFile (builtins.toPath languages-json));
1012 isGitGrammar = (grammar:
1113 builtins.hasAttr "source" grammar && builtins.hasAttr "git" grammar.source
1214 && builtins.hasAttr "rev" grammar.source);