TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Use fromTOML on Nix >= 2.6.0 (#1892)

Browse source
This commit is contained in:
Max 2022-03-30 18:28:05 +02:00 • committed by GitHub
parent 58758fee61
commit 4eed4c26e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
grammars.nix
View file

@ -5,8 +5,10 @@ let
languages-json = runCommand "languages-toml-to-json" { } '' languages-json = runCommand "languages-toml-to-json" { } ''
${yj}/bin/yj -t < ${./languages.toml} > $out ${yj}/bin/yj -t < ${./languages.toml} > $out
''; '';
languagesConfig = languagesConfig = if lib.versionAtLeast builtins.nixVersion "2.6.0" then
builtins.fromJSON (builtins.readFile (builtins.toPath languages-json)); builtins.fromTOML (builtins.readFile ./languages.toml)
else
builtins.fromJSON (builtins.readFile (builtins.toPath languages-json));
isGitGrammar = (grammar: isGitGrammar = (grammar:
builtins.hasAttr "source" grammar && builtins.hasAttr "git" grammar.source builtins.hasAttr "source" grammar && builtins.hasAttr "git" grammar.source
&& builtins.hasAttr "rev" grammar.source); && builtins.hasAttr "rev" grammar.source);