nar: fix ordering of case-hacked paths on macOS #286
Merged
Conversation
This file contains 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
sandydoo
commented
Oct 4, 2024
Comment on lines
+103
to
+105
| case Map.insertLookupWithKey (\_ n _ -> n) name f acc of | ||
| (Nothing, newMap) -> newMap | ||
| (Just conflict, _) -> error $ "File name collision between " ++ (path </> name) ++ " and " ++ (path </> conflict) |
There was a problem hiding this comment.
Nix throws an error if there are duplicate paths in the NAR.
|
@sorki can you make a release 🙏 |
|
Yep, released as Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When undo-ing the case hack on macOS, we need to restore the original order of paths when traversing directories. This entails undo-ing the case hack for the entire listed directory and then sorting.