Use fromTOML on Nix >= 2.6.0 (#1892)

helix-editor · Mar 30, 2022 · 4eed4c2 · 4eed4c2
1 parent 58758fe
commit 4eed4c2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/grammars.nix b/grammars.nix
@@ -5,8 +5,10 @@ let
   languages-json = runCommand "languages-toml-to-json" { } ''
     ${yj}/bin/yj -t < ${./languages.toml} > $out
   '';
-  languagesConfig =
-    builtins.fromJSON (builtins.readFile (builtins.toPath languages-json));
+  languagesConfig = if lib.versionAtLeast builtins.nixVersion "2.6.0" then
+      builtins.fromTOML (builtins.readFile ./languages.toml)
+    else
+      builtins.fromJSON (builtins.readFile (builtins.toPath languages-json));
   isGitGrammar = (grammar:
     builtins.hasAttr "source" grammar && builtins.hasAttr "git" grammar.source
     && builtins.hasAttr "rev" grammar.source);