From 4eed4c26e9f72a586f9175c4976d80ba091086e6 Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Wed, 30 Mar 2022 18:28:05 +0200
Subject: [PATCH] Use fromTOML on Nix >= 2.6.0 (#1892)
---
grammars.nix | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/grammars.nix b/grammars.nix
index bcd2c2fa..ada14aaf 100644
--- 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);