movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 11:45:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib/pathWith: keep old typename, to avoid breakage in downstream projects

Browse source
This commit is contained in:
Johannes Kirschbauer 2025-02-19 09:03:18 +07:00
parent 54d9bb9cf7
commit 3f9d8a1fea
No known key found for this signature in database
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/types.nix
View file

@ -579,7 +579,7 @@ rec {
absolute ? null, absolute ? null,
}: }:
throwIf (inStore != null && absolute != null && inStore && !absolute) "In pathWith, inStore means the path must be absolute" mkOptionType { throwIf (inStore != null && absolute != null && inStore && !absolute) "In pathWith, inStore means the path must be absolute" mkOptionType {
name = "pathWith"; name = "path";
description = ( description = (
(if absolute == null then "" else (if absolute then "absolute " else "relative ")) + (if absolute == null then "" else (if absolute then "absolute " else "relative ")) +
"path" + "path" +
@ -588,7 +588,7 @@ rec {
descriptionClass = "noun"; descriptionClass = "noun";
merge = mergeEqualOption; merge = mergeEqualOption;
functor = defaultFunctor "pathWith" // { functor = defaultFunctor "path" // {
type = pathWith; type = pathWith;
payload = {inherit inStore absolute; }; payload = {inherit inStore absolute; };
binOp = lhs: rhs: if lhs == rhs then lhs else null; binOp = lhs: rhs: if lhs == rhs then lhs else null;