diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2020-11-15 11:54:15 -0500 |
|---|---|---|
| committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2021-06-28 11:59:03 -0400 |
| commit | 98336c223b7778053bf8136c2f269ce4dfec29f5 (patch) | |
| tree | 4791adb00d41bf15ce2884c31cb2cd2ebb8b62cd /pkgs/pkgs-lib | |
| parent | 2db14a9cb5a9477b80db549b302b15cbebc77b3d (diff) | |
pkgs-lib: allow paths in TOML, YAML and JSON
Paths get automatically added to the store. The INI generator currently chokes
on paths, so it is not supported for now.
Diffstat (limited to 'pkgs/pkgs-lib')
| -rw-r--r-- | pkgs/pkgs-lib/formats.nix | 2 | ||||
| -rw-r--r-- | pkgs/pkgs-lib/tests/formats.nix | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 4b6982f387d0..4d5395664612 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -30,6 +30,7 @@ rec { int float str + path (attrsOf valueType) (listOf valueType) ]) // { @@ -112,6 +113,7 @@ rec { int float str + path (attrsOf valueType) (listOf valueType) ] // { diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index 2c117e29e9ba..679fde015228 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -38,6 +38,7 @@ in runBuildTests { str = "foo"; attrs.foo = null; list = [ null null ]; + path = ./formats.nix; }; expected = '' { @@ -52,6 +53,7 @@ in runBuildTests { null ], "null": null, + "path": "${./formats.nix}", "str": "foo", "true": true } @@ -67,6 +69,7 @@ in runBuildTests { str = "foo"; attrs.foo = null; list = [ null null ]; + path = ./formats.nix; }; expected = '' { @@ -80,6 +83,7 @@ in runBuildTests { null ], "null": null, + "path": "${./formats.nix}", "str": "foo", "true": true } |