From 947a7d33f997d8782ae74e2e76fb7645e86b663e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 16 Aug 2020 15:39:52 +0200
Subject: [PATCH] lib: add importTOML
Complements the `lib.importJSON`. `builtins.readTOML` has been
introduced in Nix 2.1.
---
lib/default.nix | 2 +-
lib/trivial.nix | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/default.nix b/lib/default.nix
index 43b9ab5930c..44076d29517 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -66,7 +66,7 @@ let
stringLength sub substring tail;
inherit (trivial) id const pipe concat or and bitAnd bitOr bitXor
bitNot boolToString mergeAttrs flip mapNullable inNixShell min max
- importJSON warn info showWarnings nixpkgsVersion version mod compare
+ importJSON importTOML warn info showWarnings nixpkgsVersion version mod compare
splitByAndCompare functionArgs setFunctionArgs isFunction toHexString toBaseDigits;
inherit (fixedPoints) fix fix' converge extends composeExtensions
makeExtensible makeExtensibleWithCustomName;
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 9501a2906ca..268f39d3210 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -281,6 +281,12 @@ rec {
importJSON = path:
builtins.fromJSON (builtins.readFile path);
+ /* Reads a TOML file.
+
+ Type :: path -> any
+ */
+ importTOML = path:
+ builtins.fromTOML (builtins.readFile path);
## Warnings