Skip to content

Commit 1983138

Browse files
authored
Merge pull request RustPython#5148 from coolreader18/upd-nix
Update nix and socket2
2 parents 1ab133d + 9cc571b commit 1983138

File tree

5 files changed

+98
-118
lines changed

5 files changed

+98
-118
lines changed

Cargo.lock

Lines changed: 53 additions & 85 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ itertools = "0.11.0"
5858
is-macro = "0.3.0"
5959
libc = "0.2.151"
6060
log = "0.4.16"
61-
nix = "0.26"
61+
nix = { version = "0.27", features = ["fs", "user", "process", "term", "time", "signal", "ioctl", "socket", "sched", "zerocopy", "dir", "hostname", "net", "poll"] }
6262
malachite-bigint = "0.2.0"
6363
malachite-q = "0.4.4"
6464
malachite-base = "0.4.4"
@@ -70,7 +70,7 @@ once_cell = "1.18"
7070
parking_lot = "0.12.1"
7171
paste = "1.0.7"
7272
rand = "0.8.5"
73-
rustyline = "11"
73+
rustyline = "13"
7474
serde = { version = "1.0.133", default-features = false }
7575
schannel = "0.1.22"
7676
static_assertions = "1.1"
@@ -152,5 +152,4 @@ lto = "thin"
152152

153153
[patch.crates-io]
154154
# REDOX START, Uncomment when you want to compile/check with redoxer
155-
# nix = { git = "https://github.com/coolreader18/nix", branch = "0.26.2-redox" }
156155
# REDOX END

stdlib/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ termios = "0.3.3"
9494

9595
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
9696
gethostname = "0.2.3"
97-
socket2 = { version = "0.4.4", features = ["all"] }
98-
dns-lookup = "1.0.8"
97+
socket2 = { version = "0.5.4", features = ["all"] }
98+
dns-lookup = "2"
9999
openssl = { version = "0.10.62", optional = true }
100100
openssl-sys = { version = "0.9.80", optional = true }
101101
openssl-probe = { version = "0.1.5", optional = true }
@@ -112,7 +112,7 @@ widestring = { workspace = true }
112112
[target.'cfg(windows)'.dependencies.winapi]
113113
version = "0.3.9"
114114
features = [
115-
"winsock2", "ifdef", "netioapi",
115+
"winsock2", "ifdef", "netioapi", "ws2tcpip",
116116
]
117117

118118
[target.'cfg(windows)'.dependencies.windows-sys]

0 commit comments

Comments
 (0)