holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade nix to 0.27 (#10223)

Browse Source 
This fixes a segfault on Android when fetching the user group.

See: https://github.com/nix-rust/nix/issues/2084
This commit is contained in:
Skyler Hawthorne 2023-09-04 16:41:28 -04:00 committed by GitHub
parent b15c824932
commit 278bf7ffa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Cargo.lock generated
View File

@ -989,7 +989,7 @@ version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e" checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e"
dependencies = [ dependencies = [
"nix", "nix 0.26.2",
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
@ -2519,6 +2519,17 @@ dependencies = [
"static_assertions", "static_assertions",
] ]
[[package]]
name = "nix"
version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "896d4664b919f48478f3ce02c502adfe9bffeb61563d2a12ddf1aad8f6cd926f"
dependencies = [
"bitflags 2.3.3",
"cfg-if",
"libc",
]
[[package]] [[package]]
name = "nom" name = "nom"
version = "7.1.3" version = "7.1.3"
@ -2603,7 +2614,7 @@ dependencies = [
"log", "log",
"miette", "miette",
"mimalloc", "mimalloc",
"nix", "nix 0.27.0",
"nu-ansi-term", "nu-ansi-term",
"nu-cli", "nu-cli",
"nu-cmd-base", "nu-cmd-base",
@ -2799,7 +2810,7 @@ dependencies = [
"mime_guess", "mime_guess",
"mockito", "mockito",
"native-tls", "native-tls",
"nix", "nix 0.27.0",
"notify-debouncer-full", "notify-debouncer-full",
"nu-ansi-term", "nu-ansi-term",
"nu-cmd-base", "nu-cmd-base",
@ -2995,7 +3006,7 @@ dependencies = [
"libproc", "libproc",
"log", "log",
"mach2", "mach2",
"nix", "nix 0.27.0",
"ntapi", "ntapi",
"once_cell", "once_cell",
"procfs", "procfs",

2
Cargo.toml
View File

@ -87,7 +87,7 @@ signal-hook = { version = "0.3", default-features = false }
winresource = "0.1" winresource = "0.1"
[target.'cfg(target_family = "unix")'.dependencies] [target.'cfg(target_family = "unix")'.dependencies]
nix = { version = "0.26", default-features = false, features = [ nix = { version = "0.27", default-features = false, features = [
"signal", "signal",
"process", "process",
"fs", "fs",

2
crates/nu-command/Cargo.toml
View File

@ -100,7 +100,7 @@ winreg = "0.50"
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
libc = "0.2" libc = "0.2"
umask = "2.1" umask = "2.1"
nix = { version = "0.26", default-features = false, features = ["user"] } nix = { version = "0.27", default-features = false, features = ["user"] }
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies.trash] [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies.trash]
optional = true optional = true

2
crates/nu-system/Cargo.toml
View File

@ -18,7 +18,7 @@ log = "0.4"
sysinfo = "0.29" sysinfo = "0.29"
[target.'cfg(target_family = "unix")'.dependencies] [target.'cfg(target_family = "unix")'.dependencies]
nix = { version = "0.26", default-features = false, features = ["fs", "term", "process", "signal"] } nix = { version = "0.27", default-features = false, features = ["fs", "term", "process", "signal"] }
[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies] [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
procfs = "0.15" procfs = "0.15"