Skip to content

Commit

Permalink
build: bump nix from 0.23.1 to 0.24.1 (starship#3925)
Browse files Browse the repository at this point in the history
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
davidkna and dependabot[bot] authored Apr 26, 2022
1 parent 5174c9a commit d4d84a5
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 5 deletions.
17 changes: 14 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ features = [
]

[target.'cfg(not(windows))'.dependencies]
nix = "0.23.1"
nix = { version = "0.24.1", default-features = false, features = ["feature", "fs", "user"] }

[build-dependencies]
shadow-rs = "0.11.0"
Expand Down
7 changes: 6 additions & 1 deletion src/modules/git_status.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,12 @@ fn git_status_wsl(context: &Context, conf: &GitStatusConfig) -> Option<String> {

// Ensure this is WSL
// This is lowercase in WSL1 and uppercase in WSL2, just skip the first letter
if !uname().release().contains("icrosoft") {
if !uname()
.ok()?
.release()
.to_string_lossy()
.contains("icrosoft")
{
return None;
}

Expand Down

0 comments on commit d4d84a5

Please sign in to comment.