From 23c25d5231856e8cfd60049582c865da97bc5d44 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 31 Dec 2022 00:49:04 +0100 Subject: [PATCH] lib.strings.isConvertibleWithToString: Refactor to reuse isStringLike --- lib/strings.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index 89574bc8367c..db89f60c480c 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -810,10 +810,9 @@ rec { null, bool, list of similarly coercible values. */ isConvertibleWithToString = x: - elem (typeOf x) [ "path" "string" "null" "int" "float" "bool" ] || - (isList x && lib.all isConvertibleWithToString x) || - x ? outPath || - x ? __toString; + isStringLike x || + elem (typeOf x) [ "null" "int" "float" "bool" ] || + (isList x && lib.all isConvertibleWithToString x); /* Check whether a value can be coerced to a string. The value must be a string, path, or attribute set.