Fix conflicts in lazy trees from master #14
Draft
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
When writing a shebang script, you expect your path to be relative to the script, not the cwd. We previously handled this correctly for relative file paths, but not for expressions. This handles both -p & -E args. My understanding is this should be what we want in any cases I can think of - people run scripts from many different working directories. @edolstra is there any reason to handle -p args differently in this case? Fixes NixOS#4232
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
…' into more-nix-shell
In C++ we don't need to salt the hash.
The default value for the setting was evaluated by calling a method on the object _being currently constructed_, so we were using it before all fields were initialized. This has been fixed by making the called method static, and not using the previously used fields at all. But functionality hasn't changed! The fields were usually always zero (by chance?) anyway, meaning the conditional path was always taken. Thus the current logic has been kept, the code simplified, and UB removed. This was found with the helper of UBSan.
Doc comments: use std::unordered_map
This was accidentally introduced in f71b4da. We didn't notice this because the version got interpreted by the daemon as the obsolete "CPU affinity will follow" field, and being non-zero, it would then read another integer for the ignored CPU affinity.
Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
Test the `run` and `shell` envs for stray variables
Pretty print idempotently
lint: fix shellcheck for misc/systemv/nix-daemon
…ion-twice BasicClientConnection::handshake(): Don't send our version twice
Make `#!nix-shell` arguments and options relative to script
docs: fill out language/types.md#type-path
Following what is outlined in NixOS#10766 refactor the uds-remote-store such that the member variables (state) don't live in the store itself but in the config object. Additionally, the config object includes a new necessary constructor that takes a scheme & authority. Tests are commented out because of linking errors with the current config system. When there is a new config system we can reenable them. Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>
It is a property of the configuration of a store --- how a store URL is parsed into a store config, not a store itself. Progress towards NixOS#10766
Move `uriSchemes` to `*StoreConfig`
Eval cache: fix cache regressions
…ction This also renames clientVersion and daemonVersion to the more correct protoVersion (since it's the version agreed to by both sides).
This wasn't moving the underlying buffer, so if the buffer was non-empty, it could lose data.
In _very_ rare cases (I had about 7 cases out of 32200 files!), the order of how inherit-from bindings are printed when using `nix-instantiate --parse` gets messed up. The cause of this seems to be because the std::map the bindings are placed in is keyed on a _pointer_, which then uses an [implementation-defined strict total order](https://en.cppreference.com/w/cpp/language/operator_comparison#Pointer_total_order). The fix here is to key the bindings on their displacement instead, which maintains the same order as they appear in the file. Unfortunately I wasn't able to make a reproducible test for this in the source, there's something about the local environment that makes it unreproducible for me. However I was able to make a reproducible test in a Nix build on a Nix version from a very recent master: nix build github:infinisil/non-det-nix-parsing-repro Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Makes parsing more consistent and is a super minor optimisation Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
libmain: add missing header include
Factor out commonality between WorkerProto::Basic{Client,Server}Connection
parser: Remove empty multiline string parts earlier
Fix non-deterministic inherit printing
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.
No description provided.