Skip to content

bump nix to 0.29.0 #3123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
YJDoc2 merged 2 commits into from
Mar 24, 2025
Merged

bump nix to 0.29.0 #3123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea9f654
bump nix to 0.29
kemingy Mar 22, 2025
48b4c0b
change to 0.29 for all
kemingy Mar 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 9 additions & 27 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion crates/libcgroups/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ systemd = ["v2", "nix/socket", "nix/uio"]
cgroupsv2_devices = ["rbpf", "libbpf-sys", "errno", "libc", "nix/dir"]

[dependencies]
nix = { version = "0.28.0", features = ["signal", "user", "fs"] }
nix = { version = "0.29.0", features = ["signal", "user", "fs"] }
procfs = "0.17.0"
oci-spec = { version = "~0.7.1", features = ["runtime"] }
fixedbitset = "0.5.7"
Expand Down
2 changes: 1 addition & 1 deletion crates/libcontainer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ chrono = { version = "0.4", default-features = false, features = [
] }
fastrand = "^2.3.0"
libc = "0.2.171"
nix = { version = "0.28.0", features = [
nix = { version = "0.29.0", features = [
"socket",
"sched",
"mount",
Expand Down
2 changes: 1 addition & 1 deletion crates/libcontainer/src/channel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ where
// there is only one SCM_RIGHTS message and will only process the first
// message.
let fds: Option<F> = msg
.cmsgs()
.cmsgs()?
.find_map(|cmsg| {
if let socket::ControlMessageOwned::ScmRights(fds) = cmsg {
Some(fds)
Expand Down
2 changes: 1 addition & 1 deletion crates/youki/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ chrono = { version = "0.4", default-features = false, features = ["clock", "serd
libcgroups = { path = "../libcgroups", default-features = false, version = "0.5.3" } # MARK: Version
libcontainer = { path = "../libcontainer", default-features = false, version = "0.5.3" } # MARK: Version
liboci-cli = { path = "../liboci-cli", version = "0.5.3" } # MARK: Version
nix = "0.28.0"
nix = "0.29.0"
pentacle = "1.1.0"
procfs = "0.17.0"
serde_json = "1.0"
Expand Down
25 changes: 16 additions & 9 deletions experiment/seccomp/Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion experiment/seccomp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ autoexamples = true
keywords = ["youki", "container", "seccomp"]

[dependencies]
nix = { version = "0.27.1", features = [
nix = { version = "0.29.0", features = [
"ioctl",
"socket",
"sched",
Expand Down
2 changes: 1 addition & 1 deletion experiment/seccomp/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fn recv_fd<F: FromRawFd>(sock: RawFd) -> nix::Result<Option<F>> {

let mut cmsg_buf = nix::cmsg_space!(RawFd);
let msg = socket::recvmsg::<UnixAddr>(sock, &mut iov, Some(&mut cmsg_buf), MsgFlags::empty())?;
match msg.cmsgs().next() {
match msg.cmsgs()?.next() {
Some(ControlMessageOwned::ScmRights(fds)) if !fds.is_empty() => {
let fd = unsafe { F::from_raw_fd(fds[0]) };
Ok(Some(fd))
Expand Down
2 changes: 1 addition & 1 deletion tests/contest/contest/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ anyhow = "1.0"
flate2 = "1.1"
libcgroups = { path = "../../../crates/libcgroups" }
libcontainer = { path = "../../../crates/libcontainer" }
nix = "0.28.0"
nix = "0.29.0"
num_cpus = "1.16"
oci-spec = { version = "0.7.1", features = ["runtime"] }
once_cell = "1.21.1"
Expand Down
2 changes: 1 addition & 1 deletion tests/contest/contest/src/tests/seccomp_notify/seccomp_agent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pub fn recv_seccomp_listener(seccomp_listener: &Path) -> SeccompAgentResult {
drop(socket);
// We are expecting 1 SCM_RIGHTS message with 1 fd.
let cmsg = msg
.cmsgs()
.cmsgs()?
.next()
.context("expecting at least 1 SCM_RIGHTS message")?;
let fd = match cmsg {
Expand Down
2 changes: 1 addition & 1 deletion tests/contest/runtimetest/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"

[dependencies]
oci-spec = { version = "0.7.1", features = ["runtime"] }
nix = "0.28.0"
nix = "0.29.0"
anyhow = "1.0"
libc = "0.2.171" # TODO (YJDoc2) upgrade to latest
nc = "0.9.5"