From 98336c223b7778053bf8136c2f269ce4dfec29f5 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 15 Nov 2020 11:54:15 -0500 Subject: [PATCH] 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. --- pkgs/pkgs-lib/formats.nix | 2 ++ pkgs/pkgs-lib/tests/formats.nix | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index 4b6982f387d..4d539566461 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 2c117e29e9b..679fde01522 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 }