Upstream tracking#165
Draft
grahamc wants to merge 2890 commits into
Draft
Conversation
…cessor There may be more informative than the generate "path does not exist". In any case it makes --impure more consistent because the UnionSourceAccessor now produces the same exceptions from storeFS.
This is necessary if the path has an overriden display (e.g. if it's a substituted source tree).
This was actually preventing display of correct paths, since the exception is thrown by PosixSourceAccessor(), so SubstitutedSourceAccessor::showPath() was never called. (This was previously masked in some cases by UnionSourceAccessor.)
There is a race between activity and logger teardown, so we switch from a unique_ptr to a raw pointer and leak the logger so it persists across all activity teardowns. Signed-off-by: Lisanna Dettwyler <lisanna.dettwyler@gmail.com> (cherry picked from commit be84169)
Improve path display
Fix logging segfault by leaking logger
…d1b-2a93-4676-8caf-a71bae059d43 Release v3.21.0
The logger needs to be manually stopped because it is being leaked. Signed-off-by: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
Stop leaked logger in Finally block
Instead of
error: syntax error, unexpected end of file
at «git+file:///.../nixos?rev=0defd19d32413f757d7273596cd9641cb91af25a&shallow=1&submodules=1»/configuration.nix:1:1:
Nix now shows
error: syntax error, unexpected end of file
at «git+file:///home/eelco/Dev/nix-master/nixos?rev=0defd19d32413f757d7273596cd9641cb91af25a&shallow=1&submodules=1»/configuration.nix:1:1:
1| (empty file)
Denote empty files in stack traces
This happens if a lockfile contains an input with an unknown `type` field.
Input::isRelative(): Fix assertion failure
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
11 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.
Motivation
Not intended to be merged directly. This PR is a convenience to show the diff between upstream Nix and Determinate Nix (the
mainbranch).Continuation of #4.