From 847a8167fe3b52c3b8e19017b31a97e12ad411ea Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Wed, 29 Jan 2025 15:31:19 +0100 Subject: fix(by-name-overlay): Actually return paths The previous version regressed and returned strings with context (which would then end up in the nix store). --- by-name-overlay.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/by-name-overlay.nix b/by-name-overlay.nix index c578861..4253aa4 100644 --- a/by-name-overlay.nix +++ b/by-name-overlay.nix @@ -82,7 +82,7 @@ assert fileRegex == null -> fileName != null; let then namesForElementShard shard type else namesForElementDirect shard type; - # Type: String -> String -> ListOf Path + # Type: String -> String -> String -> ListOf Path mkPath = shard: name: toplevelType: let rawPath = baseDirectory + "/${shard}/${name}"; paths = filterAttrs (_: v: v != null) (mapAttrs' (name: value: @@ -91,7 +91,7 @@ assert fileRegex == null -> fileName != null; let else nameValuePair name null) (builtins.readDir rawPath)); checkPath = pathSegment: type: let - path = "${rawPath}/${pathSegment}"; + path = rawPath + "/${pathSegment}"; in if builtins.pathExists path then -- cgit 1.4.1