Detect and report nix shell #115117
Merged
Detect and report nix shell #115117
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
1. Turned patch-binaries-for-nix from a boolean into a ternary flag: true, false, and unset. 2. When patch-binaries-for-nix is unset, we continue with the existing NixOS detection heuristic (look for nixos in /etc/os-release, if present), but if we are not atop NixOS, then issue a note if we see the IN_NIX_SHELL environment variable telling the user to consider setting patch-binaries-for-nix explicitly.
|
(rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
albertlarsan68
approved these changes
Aug 23, 2023
kadiwa4
reviewed
Aug 23, 2023
In addition: Incorporated some review feedback (namely, removed a useless initial assignment to True that was never read), and unified code a bit more between bootstrap.py and download.rs (by using the same variable name for the same concept).
|
@bors r=albertlarsan68 rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 25, 2023
Rollup of 9 pull requests Successful merges: - rust-lang#114987 (elaborate a bit on the (lack of) safety in 'Mmap::map') - rust-lang#115084 (Add smir `predicates_of`) - rust-lang#115117 (Detect and report nix shell) - rust-lang#115124 (kmc-solid: Import `std::sync::PoisonError` in `std::sys::solid::os`) - rust-lang#115152 (refactor(lint): translate `RenamedOrRemovedLint`) - rust-lang#115154 (Move some ui tests to subdirectories) - rust-lang#115167 (Fix ub-int-array test for big-endian platforms) - rust-lang#115172 (Add more tests for if_let_guard) - rust-lang#115177 (Add symbols for Clippy usage) r? `@ghost` `@rustbot` modify labels: rollup
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.
Better diagnostics for people using nix subshell on non-NixOS.
Turned patch-binaries-for-nix from a boolean into a ternary flag: true, false, and unset.
When patch-binaries-for-nix is unset, we continue with the existing NixOS detection heuristic (look for nixos in /etc/os-release, if present), but if we are not atop NixOS, then issue a note if we see the IN_NIX_SHELL environment variable telling the user to consider setting patch-binaries-for-nix explicitly.
Fix #115073