diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-11-02 19:26:04 +0100 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-11-02 19:26:04 +0100 |
| commit | 99f957968ca79b056a912e53b29e530095ce7e07 (patch) | |
| tree | 8f110985fa19a512523db9336a6e330ae85c6059 | |
| parent | by-name.nix: Also filter empty results for the `fileRegex` codepath (diff) | |
| download | nix-library-99f957968ca79b056a912e53b29e530095ce7e07.zip | |
| -rw-r--r-- | by-name.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/by-name.nix b/by-name.nix index 5e3242e..b935b3e 100644 --- a/by-name.nix +++ b/by-name.nix @@ -25,8 +25,8 @@ assert fileRegex == null -> fileName != null; let else fileRegex; fileDisplay = if fileName == null - then "a file matching ${fileRegex}" - else fileName; + then "a file matching '${fileRegex}'" + else "'${fileName}'"; # From nixpkgs/lib {{{ # These functions are taken straight out of the `nixpkgs/lib`. @@ -108,7 +108,7 @@ assert fileRegex == null -> fileName != null; let # The `namesForShard` function should have already printed a warning. [null] else if (builtins.attrValues paths) == [] - then builtins.warn "Did not found '${fileDisplay}' in ${builtins.toString rawPath}. Skipped" [null] + then builtins.warn "Did not find ${fileDisplay} in ${builtins.toString rawPath}. Skipped" [null] else mapAttrsToList checkPath paths; filterNull = list: builtins.filter (value: value != null) list; |
