diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2020-08-16 15:39:52 +0200 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2020-09-12 16:37:50 +0200 |
| commit | 947a7d33f997d8782ae74e2e76fb7645e86b663e (patch) | |
| tree | 61badf7800f9a295abc32c21be2a13f2047155db | |
| parent | 607509ac8f31794bdf9304eebf857d7137b60168 (diff) | |
| download | nixpkgs-947a7d33f997d8782ae74e2e76fb7645e86b663e.tar nixpkgs-947a7d33f997d8782ae74e2e76fb7645e86b663e.tar.gz nixpkgs-947a7d33f997d8782ae74e2e76fb7645e86b663e.tar.bz2 nixpkgs-947a7d33f997d8782ae74e2e76fb7645e86b663e.tar.lz nixpkgs-947a7d33f997d8782ae74e2e76fb7645e86b663e.tar.xz nixpkgs-947a7d33f997d8782ae74e2e76fb7645e86b663e.tar.zst nixpkgs-947a7d33f997d8782ae74e2e76fb7645e86b663e.zip | |
lib: add importTOML
Complements the `lib.importJSON`. `builtins.readTOML` has been introduced in Nix 2.1.
| -rw-r--r-- | lib/default.nix | 2 | ||||
| -rw-r--r-- | lib/trivial.nix | 6 |
2 files changed, 7 insertions, 1 deletions
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 |