Skip to content

staging-nixos -> staging-next#501226

Merged
vcunat merged 82 commits into
staging-nextfrom
staging-nixos
Mar 19, 2026
Merged

staging-nixos -> staging-next#501226
vcunat merged 82 commits into
staging-nextfrom
staging-nixos

Conversation

@vcunat

@vcunat vcunat commented Mar 19, 2026

Copy link
Copy Markdown
Member

Because the merge of staging-next -> master is imminent via PR #497493

kmein and others added 30 commits January 27, 2026 16:58
@kmein @jfly
nixos/nspawn-container: add support for shared directory
a88839a 
Co-authored-by: Jeremy Fleischman <jeremyfleischman@gmail.com>
@kmein
nixos/virtualisation: correct virtualisation.vlans docstring
628195b
@kmein @jfly
nixos/test-driver: fix typo
197287d 
Co-authored-by: Jeremy Fleischman <jeremyfleischman@gmail.com>
@kmein @jfly
nixos/test-driver: refactor Machine to BaseMachine and QemuMachine
799cafc 
This prepares the driver for non-QEMU backends by abstracting
the machine logic.

Co-authored-by: Jeremy Fleischman <jeremyfleischman@gmail.com>
@kmein @jfly
nixos/test-driver: add support for nspawn containers
23f1e63 
Co-authored-by: Jeremy Fleischman <jeremyfleischman@gmail.com>
@kmein
nixos/tests: add nspawn container bittorrent integration test
1bbcf46
@kmein @jfly
nixos/tests: add nspawn container integration test
930f45e 
Co-authored-by: Jeremy Fleischman <jeremyfleischman@gmail.com>
@kmein
nixos/test-driver: fix grammar and typos
7c82198
@kmein
nixos/test-driver: implement container↔VM networking
0702405
@kmein
nixos/test-driver: deprecate --keep-vm-state in favour of --keep-mach…
d90e24b 
…ine-state
@kmein
nixos/test-driver: deprecate copy_from_vm in favour of copy_from_machine
47b08df
@kmein
nixos/tests: move container integration test to nixos-test-driver.con…
898fc1d 
…tainers
@kmein
nixos/test-driver: rename machine properties to machines_{qemu,nspawn}
4cd7413
@kmein
nixos/test-driver: improve overlapping machine name warning
1dbb174
@kmein
nixos/test-driver: use systemd container interface for SSH backdoor
8e0487c
@kmein
nixos/test-driver: provide all machines from read-only allMachines op…
0d1a353 
…tion
@kmein
nixos/test-driver: remove superfluous machine methods
884c63f
@kmein
nixos/test-driver: stream nspawn container journal
a4fa7a9
@kmein
nixos/test-driver: add machine name to all log output
0e1d359
@kmein
nixos/test-driver: do not set -x commands in nspawn containers
2e959ab
@kmein @roberth
nixos/test-driver: document rationale for creating /etc/os-release
f1d0d7a 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
@kmein
nixos/test-driver: document implications of sourcing /etc/profile wit…
019697d 
…h nspawn machines
@kmein
nixos/virtualisation: assert nspawn container name length
af0238c 
If the names for systemd-nspawn containers are too long,
the generated bridge interface names will surpass the
kernel limit IFNAMSIZ (15 characters + '\0').
@kmein
nixos/virtualisation: disallow specialisation in nspawn-container
3acd5ca
@kmein
nixos/test-driver: remove systemd dependency if no containers are con…
1846748 
…figured
@kmein
nixos/test-driver: show all lines of container journal
9988469
@kmein
nixos/test-driver: use long options for journalctl call
1118384
@kmein
nixos/test-driver: required vm_names and container_names
8c8bf9b
@kmein
nixos/test-driver: wait for READY message from nspawn container
c4c96a7
@kmein
nixos/tests: remove firewall configuration
2038234 
The test merely ensures that machines can reach each other
via ICMP ping. This does not require the firewall to be opened
or disabled.
@vcunat vcunat enabled auto-merge March 19, 2026 06:11
@vcunat vcunat added this pull request to the merge queue Mar 19, 2026
@nixpkgs-ci nixpkgs-ci Bot added 8.has: package (update) This PR updates a package to a newer version 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. labels Mar 19, 2026
Merged via the queue into staging-next with commit 2e5b118 Mar 19, 2026
31 checks passed
@zowoq

zowoq commented Mar 19, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

As this has been merged to staging-next but staging-next hasn't been merged to master yet, where should today's kernel updates go? master or staging-next? #501448

@zowoq zowoq mentioned this pull request Mar 19, 2026
Merged
13 tasks
@vcunat

vcunat commented Mar 20, 2026

Copy link
Copy Markdown
Member Author

It hasn't merged yet, but https://hydra.nixos.org/jobset/nixos/unstable is building it already with nixos.tests.* about halfway through now, so I believe we can still add kernel updates. Merging to master now happens basically right after clearing any channel blockers.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@bengsparks bengsparks Awaiting requested review from bengsparks

@GaetanLepage GaetanLepage Awaiting requested review from GaetanLepage

@jfly jfly Awaiting requested review from jfly

@philiptaron philiptaron Awaiting requested review from philiptaron

@pluiedev pluiedev Awaiting requested review from pluiedev

@rnhmjoj rnhmjoj Awaiting requested review from rnhmjoj

@tfc tfc Awaiting requested review from tfc

@thiagokokada thiagokokada Awaiting requested review from thiagokokada

@yuannan yuannan Awaiting requested review from yuannan

Assignees

No one assigned

Labels

8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.