[Backport release-23.05] Improvements to pathType, pathIsDirectory and pathIsRegularFile#233560
Merged
roberth merged 8 commits intorelease-23.05from May 23, 2023
Merged
Conversation
These functions only work with the filesystem, they don't import anything as sources (cherry picked from commit c701a4d)
Co-Authored-By: Robert Hensing <[email protected]> (cherry picked from commit a1dedc9)
Co-Authored-By: Robert Hensing <[email protected]> (cherry picked from commit 5346636)
Previously this function couldn't handle / being passed, it would throw
an error:
error: attribute '' missing
at nixpkgs/lib/filesystem.nix:24:20:
23| */
24| pathType = path: (readDir (dirOf path)).${baseNameOf path};
| ^
25|
Consequently this also fixes the
lib.filesystem.{pathIsDirectory,pathIsRegularFile} functions.
(cherry picked from commit bb6eab0)
Previously it would fail with
error: attribute 'nonexistent' missing
at nixpkgs/lib/filesystem.nix:29:10:
28| if dirOf path == path then "directory"
29| else (readDir (dirOf path)).${baseNameOf path};
| ^
30|
(cherry picked from commit d064d97)
(cherry picked from commit 84a3d63)
Co-Authored-By: Robert Hensing <[email protected]> (cherry picked from commit fcaa2b1)
Co-Authored-By: Robert Hensing <[email protected]> (cherry picked from commit 378bf1a)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bot-based backport to
release-23.05, triggered by a label in #224834.