Skip nix upgrade-nix when Nix is installed in a nix profile
#622
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
Also check that Nix can be upgraded before running `nix upgrade-nix` to work around a bug. See: <NixOS/nix#5473>
SteveLauC
reviewed
Nov 28, 2023
Comment on lines
+409
to
+419
| // Should we attempt to upgrade Nix with `nix upgrade-nix`? | ||
| #[allow(unused_mut)] | ||
| let mut should_self_upgrade = cfg!(target_os = "macos"); | ||
|
|
||
| #[cfg(target_os = "linux")] | ||
| { | ||
| // We can't use `nix upgrade-nix` on NixOS. | ||
| if let Ok(Distribution::NixOS) = Distribution::detect() { | ||
| should_self_upgrade = false; | ||
| } | ||
| } |
There was a problem hiding this comment.
Suggested change
| // Should we attempt to upgrade Nix with `nix upgrade-nix`? | |
| #[allow(unused_mut)] | |
| let mut should_self_upgrade = cfg!(target_os = "macos"); | |
| #[cfg(target_os = "linux")] | |
| { | |
| // We can't use `nix upgrade-nix` on NixOS. | |
| if let Ok(Distribution::NixOS) = Distribution::detect() { | |
| should_self_upgrade = false; | |
| } | |
| } | |
| // Should we attempt to upgrade Nix with `nix upgrade-nix`? | |
| let mut should_self_upgrade = if cfg!(target_os = "macos") { | |
| true | |
| } else if cfg!(target_os = "linux") { | |
| !matches!(Distribution::detect(), Distribution::NixOS) | |
| } else { | |
| unreachable!() | |
| }; |
Maybe we can do this here, it has better readability, though the generated code looks bad:
// On Linux
let should = if false {
true
} else if true {
match Distribution::detect() {
Distribution::NixOS => true,
_ => false,
}
} else {
::core::panicking::panic("internal error: entered unreachable code")
};There was a problem hiding this comment.
Ah, I am sorry, I didn't realize that this Distribution type is only defined on Linux, and since cfg!(target_os = "macos") will be simply translated to a bool value, it requires that this type is also available on macOS, so it won't compile:(
There was a problem hiding this comment.
Ahh, I'll revert.
9999years
force-pushed
the
nix-self-upgrade
branch
from
28424c5 to
01087f6
Compare
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.
nix upgrade-nixerrors ifnixis installed in anix profile:Upstream issue: NixOS/nix#5473
This patch duplicates the relevant Nix logic and skips running
nix upgrade-nixif this error would occur: https://github.com/NixOS/nix/blob/f0180487a0e4c0091b46cb1469c44144f5400240/src/nix/upgrade-nix.cc#L102-L139I've also split the
nix upgrade-nixcall into a separate step so we can use theSkipSteperror messages appropriately.Standards checklist:
CONTRIBUTING.mdcargo build)cargo fmt)cargo clippy)cargo test)For new steps
--dry-runoption works with this step--yesoption works with this step if it is supported bythe underlying command
If you developed a feature or a bug fix for someone else and you do not have the
means to test it, please tag this person here.