From 3f9d8a1fea87660f8d0d5ad78f5a10737cd498cf Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 19 Feb 2025 09:03:18 +0700 Subject: [PATCH] lib/pathWith: keep old typename, to avoid breakage in downstream projects --- lib/types.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 07d8a28d1394..069d7b170327 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -579,7 +579,7 @@ rec { absolute ? null, }: throwIf (inStore != null && absolute != null && inStore && !absolute) "In pathWith, inStore means the path must be absolute" mkOptionType { - name = "pathWith"; + name = "path"; description = ( (if absolute == null then "" else (if absolute then "absolute " else "relative ")) + "path" + @@ -588,7 +588,7 @@ rec { descriptionClass = "noun"; merge = mergeEqualOption; - functor = defaultFunctor "pathWith" // { + functor = defaultFunctor "path" // { type = pathWith; payload = {inherit inStore absolute; }; binOp = lhs: rhs: if lhs == rhs then lhs else null;