2348 Commits

Author SHA1 Message Date
Minijackson 3b94d36d7d nixos/containers: new registries.settings option, deprecate others
Those options mapped to the deprecated V1 format,
and didn't allow using the newer format.

If any of the older options are used,
a warning is displayed,
and the generated registries.conf file follows the old V1 format.

For more information about the new format,
see https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md
2026-07-22 18:09:51 +02:00
nixpkgs-ci[bot] ce772fd977 Merge master into staging-nixos 2026-07-14 15:37:03 +00:00
Grimmauld 4ef20773d3 nixos/incus: Don't give up on missing apparmor rules directory 2026-07-14 12:51:26 +02:00
nixpkgs-ci[bot] fd549e5765 Merge master into staging-nixos 2026-07-08 18:32:04 +00:00
nixpkgs-ci[bot] 3d21b6c55f Merge master into staging-nixos 2026-07-08 12:36:04 +00:00
nixpkgs-ci[bot] 8ab1ccd1c1 Merge master into staging-next 2026-07-08 12:34:48 +00:00
Freya Andromeda 2e947118ea nixos/incus: fix incus containers being wrongly restarted on package update whilst softDaemonRestart is set
When softDaemonRestart is enabled, containers and virtual machines still get restarted when incus updates
Disabling stopIfChanged on both incus-startup and incus fixes this
2026-07-08 02:40:41 +00:00
zowoq 814dbea27f nixos/nspawn-container: hash name, remove assertion
the code comment is copied from the commit that added the assertion

https://github.com/NixOS/nixpkgs/commit/af0238c70efc80925c31d293da3bf8affca6437f
2026-07-07 10:59:58 +10:00
nixpkgs-ci[bot] 15fbd37fa0 Merge master into staging-next 2026-07-05 00:38:01 +00:00
Leon Schuermann aa19ec5231 nixos-containers: fix dummyConfig localMacAddress default
In a13b423085 ("nixos-containers: allow hard-coding container veth MAC address &
add IPv6 SLAAC test case (#462775)") I had a typo in the `localMacAddress`
setting used for the dummy container config to generate the systemd service
template. I don't think this actually causes any breakage, but it's good to fix
for consistency's sake nonetheless.
2026-07-04 15:10:21 -04:00
Martin Weinelt 5a6a726fc2 Merge remote-tracking branch 'origin/master' into staging-next 2026-07-04 20:07:10 +02:00
Adam C. Stephens a403b3f7ea nixos/incus: add storage.truenas.enable option (#527154) 2026-07-04 17:14:33 +00:00
K900 caea65bc86 Merge remote-tracking branch 'origin/master' into staging-next 2026-06-27 17:13:58 +03:00
Emily ac9d740544 nixos/qemu-vm: replace x86_64-darwin in example 2026-06-26 07:55:10 +01:00
Arian van Putten 711b692108 nixos/virtualisation/nspawn-container: add virtualisation.credentials support (#535258) 2026-06-25 15:37:09 +00:00
Arian van Putten b4a5a3d28f nixos/virtualisation/nspawn-container: add virtualisation.credentials support
Assisted-by: Claude <noreply@anthropic.com>
2026-06-25 13:44:20 +02:00
Grimmauld 58462a7e8d nixos/apparmor: fix lsm loading order (#533428) 2026-06-25 11:00:35 +00:00
Samuel Cobb fe3a142521 nixos/incus: remove named profile 2026-06-25 07:35:39 +02:00
Arian van Putten b9ce8900b0 nixos/getty: do not conditionalize on console. (#480686) 2026-06-22 11:31:00 +00:00
zowoq ff5841b780 nixos/qemu-vm: set daemon user in register-nix-paths (#526816) 2026-06-10 07:34:23 +00:00
Artemis Tosini 0fd107dc2e nixos/qemu-vm: set daemon user in register-nix-paths
The register-nix-paths service caused the nix database to be owned by
root, breaking unprivileged daemon support.

It is unclear why this worked previously.
2026-06-08 09:39:57 -04:00
Doron Behar 48995a6ef9 nixos/virtualisation: (Aarch64) remove -device virtio-gpu-pci
In 9e78baf, Aarch64 machines were added the `-device virtio-gpu-pci`
argument, to mirror `-vga std` option that was added unconditionally to
virtualised x86_64 machines. This also enabled screenshots on aarch64
machines to be taken in tests. Since then, in a7ca287, the `-vga std`
option was removed, because that is the default value of this option
embedded in QEMU since version 2.2.

Removing it from the hard-coded list of qemu options makes it possible
for the user to choose their own `-vga` value. Similarly, for Aarch
virtualised machines, choosing unconditionally the `-device virtio-gpu-pci`
option instead of e.g `-device virtio-gpu-gl-pci`, can be bothersome too - see:

https://discourse.nixos.org/t/test-an-aarch64-linux-vm-wayland-compositor-from-an-x86-64-linux-host/77416/2

This commit is similar to 44c6c2ef16 which
was reverted in #527048.
2026-06-03 13:50:32 +03:00
Adam C. Stephens 0a03e5aed7 nixos/incus: add storage.truenas.enable option
based on https://github.com/NixOS/nixpkgs/pull/522004#issuecomment-4585131794
2026-06-02 10:20:05 -04:00
K900 9d1a8dba42 Revert "nixos/virtualisation: remove hard-coded virtio-gpu-pci device from aarch machines"
This reverts commit 44c6c2ef16.

The change breaks nixosTests.login, blocking channels.
2026-06-02 11:20:17 +03:00
Martin Weinelt 42540e3376 nixos/lxcfs: fuse -> fuse3 (#526739) 2026-06-01 22:49:52 +00:00
Adam C. Stephens 7f7d2e649a nixos/lxcfs: fuse -> fuse3 2026-06-01 10:56:59 -04:00
zowoq f5c8639dd5 nixos/nspawn-container: use ty instead of mypy
the test driver package is also using ty
https://github.com/NixOS/nixpkgs/commit/85d58871aebce2ac2a1a04b8812a4a8869827bf3
2026-05-29 12:25:45 +10:00
Doron Behar b43ea96874 nixos/virtualisation: remove hard-coded virtio-gpu-pci device from aarch machines (#517012) 2026-05-28 08:00:30 +00:00
George Shammas 217d834eb9 nixos/containers: fix default gateway with privateNetwork (v2)
The fix in #523016 fixes an issue with the default gateway, however it
does so by unconditionally defining `networking.interfaces.eth0`. This
makes so if you had other methods of defining the addresses for eth0,
those now get blanked out.

Instead, move the logic around so we only define
networking.interfaces.eth0 if we really have to.
2026-05-25 22:17:45 -04:00
Michele Guerini Rocco 71f5212461 nixos/containers: fix default gateway with privateNetwork (#523016) 2026-05-23 13:45:55 +00:00
rnhmjoj 47e19f5f91 nixos/containers: fix default gateway with privateNetwork
Fixes issue reported here https://github.com/NixOS/nixpkgs/pull/515773#issuecomment-4501563586

Containers with privateNetwork have an eth0 interface configured
imperatively by the container setup script, so the networking-interfaces.nix module
doesn't know about it. Specifying the default gateway then fails
silently, unless this setup is mirrored in networking.interfaces.eth0
inside the container.
2026-05-23 09:37:17 +02:00
zowoq 5eba89ff43 nixos/nspawn-container: add "usr/bin"
same change was done for nixos/nixos-containers in https://github.com/NixOS/nixpkgs/commit/b9f2fa1c7dc9ae378c5bff43f45fc5c3fd149ae9
2026-05-22 11:27:39 +10:00
nixpkgs-ci[bot] d7f7172553 Merge master into staging-nixos 2026-05-14 18:39:31 +00:00
Maximilian Bosch 9c752701c0 nixos/test-driver: fix eval with noUserModules (#518544) 2026-05-14 18:06:39 +00:00
Maximilian Bosch d25390cc3e nixos-test-driver: fix vlan/bridge cleanup (#515874) 2026-05-14 17:26:56 +00:00
Maximilian Bosch 9f73851fdd docker: add option to prune all volumes when auto pruning (#508604) 2026-05-14 11:40:08 +00:00
Eva Emmerich 88782420cd docker: add option to prune all volumes when auto pruning
it is not possible to prune all volumes using `docker system prune`,
the best that can be done is the removal of anonymous volumes using the
`--volumes` flag
https://docs.docker.com/reference/cli/docker/system/prune/#description

add new option `autoPrune.allVolumes.enable` which runs
`docker volume prune --all --force` when the system prune service runs.
https://docs.docker.com/reference/cli/docker/volume/prune/

add new test for this feature, and the autoPrune feature
2026-05-12 10:01:09 +02:00
Jared Baur 68e2e2bde3 nixos/test-driver: fix eval with noUserModules
When "non-user" modules are not placed in baseModules or
extraModules (arguments of eval-config.nix), noUserModules.evalModules
breaks if the options defined in those modules are consumed. In order
to restore noUserModules functionality for NixOS VM (and now nspawn)
tests, the modules implementing test behavior are moved to baseModules.
2026-05-09 18:31:52 -07:00
Doron Behar 7c9a87f017 nixos/virtualisation.kvmgt: explain explicitly it is meant for host
Fix #516891.
2026-05-07 14:52:48 +03:00
Doron Behar c874469f27 nixos/virtualisation.kvmgt: use newlines to separate sentences in docstrings 2026-05-07 14:28:07 +03:00
Doron Behar 44c6c2ef16 nixos/virtualisation: remove hard-coded virtio-gpu-pci device from aarch machines
In 9e78baf5c7, Aarch machines were added
the `-device virtio-gpu-pci` argument, to mirror `-vga std` option that
was added unconditionally to virtualised x86_64 machines. Since then,
in a7ca287ecb, the `-vga std` option was
removed, because that is the default value of this option embedded in
QEMU since version 2.2.

Removing it from the hard-coded list of qemu options makes it possible
for the user to choose their own `-vga` value. Similarly, for Aarch
virtualised machines, choosing unconditionally the `-device
virtio-gpu-pci` option instead of e.g `-device virtio-gpu-gl-pci`,
can be bothersome too - see:

https://discourse.nixos.org/t/test-an-aarch64-linux-vm-wayland-compositor-from-an-x86-64-linux-host/77416/2
2026-05-07 12:29:49 +03:00
Doron Behar c0cbeb9d8e nixos/virtualisation: explain resolution is only relevant to grub 2026-05-07 12:29:43 +03:00
Adam C. Stephens 637dbd52c8 incus: 6.23.0 -> 7.0.0; incus-lts: 6.0.6-unstable-2026-03-27 -> 7.0.0 (#515853) 2026-05-06 17:45:34 +00:00
Tom Herbers 65cda367f6 nixos: incus: drop module compatibility with v6 2026-05-06 17:56:35 +02:00
Tom Herbers 622550161e nixos/incus: drop option to gate bucket support
This reverts commit 4426551578.
2026-05-05 17:43:09 +02:00
r-vdp 28820e4363 nixos/google-compute-config: avoid IFD for modprobe blacklist
readFile on a derivation output forces a build during evaluation.
Symlink the upstream file via environment.etc instead, matching the
adjacent sysctl.d handling.
2026-05-05 13:40:23 +02:00
Lucas Savva a13b423085 nixos-containers: allow hard-coding container veth MAC address & add IPv6 SLAAC test case (#462775) 2026-05-03 23:12:33 +00:00
Jacek Galowicz 948c5d0da2 nixos-test-driver: fix vlan/bridge cleanup 2026-05-03 17:45:52 +02:00
Weijia Wang d26ef0c0f6 nixos/parallels-guest: fix prltoolsd on NixOS for Parallels 26+ (#513034) 2026-05-01 22:54:42 +00:00
Adam C. Stephens 4426551578 nixos/incus: gate bucket support since it requires insecure minio
If upstream replaces minio for v7, we can drop this, but minio is now insecure forcing us to act.
2026-04-29 14:19:31 -04:00