60991 Commits

Author SHA1 Message Date
Felix Bargfeldt
299388143e flap-alerted: init at 4.5.0; nixos/flap-alerted: init module (#524652) 2026-06-02 13:31:10 +00:00
rnhmjoj
197a055a02 nixos/wireless: restrict chown /etc/wpa_supplicant scope
Otherwise the recursive chown can fail, hence wpa_supplicant doesn't
start, if some read-only file has been bind-mounted into
/etc/wpa_supplicant.

This can happen if one uses `extraConfigFile` to add a file that is
under /etc/wpa_supplicant.
2026-06-02 15:14:17 +02:00
Paul Haerle
ef79cc6846 Reinstate boot counting (#447173) 2026-06-02 12:17:39 +00:00
Ramses
60fe2249ec nixos/gdm: ensure environment from display-manager.service is propagated (#523948) 2026-06-02 11:31:43 +00:00
Sizhe Zhao
c30d560af7 nixos/firewalld: add reload triggers for config file changes (#524004) 2026-06-02 11:24:42 +00:00
winston
2b2b69cc17 nixos/gdm: ensure environment from display-manager.service is propagated 2026-06-02 13:04:20 +02:00
r-vdp
9eb570f453 nixos/systemd-boot-builder: drop unused BootFile.{current,system_identifier}
Both fields are now write-only after the previous two commits, so
remove them. BootFile is back to being just a (path, writer) pair.
2026-06-02 12:20:55 +03:00
r-vdp
c38ca6ab7d nixos/systemd-boot-builder: handle initrd-secrets failure in the writer
The CalledProcessError can only come from the append-initrd-secrets
script, so catching it in the generic write loop and then asserting
on the writer type to reach back into its `source` is the wrong
layer. Move the catch, the pristine-initrd fallback and the warning
into InitrdWithSecretsWriter itself, and pass `critical` through the
writer protocol so it can decide between aborting and falling back.

The writer carries the generation number so the warning can still
name the affected generation. write_boot_files no longer knows
anything about secrets and the isinstance assertion is gone.

Suggested-by: Will Fancher <elvishjerricco@gmail.com>
2026-06-02 12:20:55 +03:00
r-vdp
9d46e91c49 nixos/systemd-boot-builder: track critical paths separately from BootFile
Whether a write failure must be fatal is a property of the destination
path (is it needed by the configuration we are switching to?), not of
the particular BootFile instance that happened to survive
deduplication. Compute the set of critical paths up front and look it
up in write_boot_files, so the dedup loop no longer needs to pick the
"right" instance and becomes a plain order-preserving seen-set walk.

This leaves BootFile.current unused.

Suggested-by: Will Fancher <elvishjerricco@gmail.com>
2026-06-02 12:20:55 +03:00
r-vdp
dff3315fac nixos/systemd-boot-builder: use with for the secrets temp file
This guarantees the descriptor is closed even when copyfileobj raises,
matching the other writer implementations. The append-initrd-secrets
script reopens the file by path, so flush() is enough before invoking
it and the explicit close() is no longer needed.
2026-06-02 12:20:55 +03:00
r-vdp
30552ab00b nixos/systemd-boot-builder: clarify stale initrd secrets warning
Tell the user what actually happens (the old secrets stay in place) and
how to get rid of the warning, instead of just saying it is "normal".

Suggested-by: Will Fancher <elvishjerricco@gmail.com>
2026-06-02 12:20:54 +03:00
r-vdp
b4e756627d nixos/systemd-boot-builder: write each ESP path only once
Shared kernels and initrds appear once per generation in boot_files, so
InitrdWithSecretsWriter rebuilt the same file repeatedly. Prefer the
current configuration's entry so its failures stay fatal.
2026-06-02 12:20:54 +03:00
r-vdp
76673e2736 nixos/systemd-boot-builder: fall back to pristine initrd when secrets fail
Otherwise the .conf for that generation references a missing initrd and
the boot entry fails to load.
2026-06-02 12:20:54 +03:00
r-vdp
3ff32972f8 nixos/systemd-boot-builder: verify content of existing entry files
A file named nixos-<hash>.conf whose content no longer hashes to <hash>
is corrupt. Skip it so GC removes it and a fresh entry is written.
2026-06-02 12:20:54 +03:00
r-vdp
820d20f8b9 nixos/systemd-boot-builder: cache boot_path()
It calls Path.resolve() and is invoked several times per generation for
the same store paths.
2026-06-02 12:20:53 +03:00
r-vdp
85d59c4f3d nixos/systemd-boot-builder: use a set for GC root lookup
has_gc_root() iterated the entire BootFileList for every file on the
ESP, giving O(files * roots) comparisons. Build the set of kept paths
once and use O(1) membership tests instead.
2026-06-02 12:20:53 +03:00
r-vdp
146acf965f nixos/systemd-boot-builder: warn instead of aborting when an old gen's secrets fail
After removing or renaming a file in boot.initrd.secrets, older
generations' append scripts start failing. Aborting on that blocks
deploying the new configuration, so only treat a failure as fatal when
it belongs to the configuration being switched to.
2026-06-02 12:20:53 +03:00
r-vdp
6eba7d60f3 nixos/systemd-boot-builder: rebuild secret-bearing initrds atomically each run
Appending to the existing file made it grow on every rebuild and a
failed script could leave it half-written. Always rebuild from the
pristine initrd into a temp file and rename into place.
2026-06-02 12:20:53 +03:00
r-vdp
6ef460ec9d nixos/systemd-boot-builder: write loader.conf after the entries it points at
A crash between the two would leave `default <id>` referring to a
.conf that does not exist yet.
2026-06-02 12:20:53 +03:00
Will Fancher
44a974d0eb nixos/systemd-boot: Rerun secrets every switch 2026-06-02 12:20:52 +03:00
Will Fancher
1d081050c3 nixos/systemd-boot: Separate finding the placement of files from writing files 2026-06-02 12:20:52 +03:00
r-vdp
b4c278c06b nixos/systemd-boot-builder: store boot loader configs using content hashing
Co-Authored-By: AkechiShiro <14914796+AkechiShiro@users.noreply.github.com>
2026-06-02 12:20:51 +03:00
r-vdp
323ef6c123 nixos/tests/systemd-boot: use a valid machine-id
dbus-broker (now the default since #512050) calls
sd_id128_get_machine() which returns -ENOMEDIUM for an
all-zero machine-id, causing it to crash-loop and the test
to hang on multi-user.target.
2026-06-02 12:20:13 +03:00
r-vdp
69ce6b2391 nixos/systemd-boot-builder: re-instate boot counting
Co-Authored-By: Julien Malka <julien@malka.sh>
Co-Authored-By: AkechiShiro <14914796+AkechiShiro@users.noreply.github.com>
2026-06-02 12:20:12 +03:00
r-vdp
ac2410be5d nixos/systemd-boot-builder: format 2026-06-02 12:20:12 +03: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
Michael Daniels
10dc77eeb3 nixos/fonts: add Noto CJK to default fonts (#521738) 2026-06-01 22:56:23 +00:00
Martin Weinelt
42540e3376 nixos/lxcfs: fuse -> fuse3 (#526739) 2026-06-01 22:49:52 +00:00
Martin Weinelt
6154701a25 nixos/pam_mount: migrate to fuse3 (#526741) 2026-06-01 22:49:28 +00:00
zowoq
7dee0504d3 staging-nixos merge for 2026-06-01 (#526774) 2026-06-01 22:39:39 +00:00
Florian Klink
9408d6bb7e nixosTests.gocryptfs: init (#526791) 2026-06-01 19:53:16 +00:00
nixpkgs-ci[bot]
09c3691947 Merge master into staging-nixos 2026-06-01 19:40:02 +00:00
Grimmauld
439204f05d nixos/shadow: use file capabilities for newuidmap/newgidmap (#510829) 2026-06-01 19:11:38 +00:00
aktaboot
27c905ab1a nixosTests.gocryptfs: init 2026-06-01 19:56:16 +02:00
yaya
e7f47da556 various: document /dev/root unavailability; provide migration steps (#526310) 2026-06-01 17:52:54 +00:00
tomberek
b4077bcd18 nixos/test-driver: add defaultText to pythonTestDriverPackage (#509675) 2026-06-01 17:27:46 +00:00
yaya
44f79153b3 nixos/gitlab-runner: add options for privileged services (#411705) 2026-06-01 17:25:59 +00:00
Cabia Rangris
893e3dd35f klipper-flash: support can bus flashing, support flashing avr mcus (#524434) 2026-06-01 16:11:37 +00:00
Jennifer Graul
f5df55072b nixos/pam_mount: migrate to fuse3
Part of #526161
2026-06-01 17:01:36 +02:00
Adam C. Stephens
7f7d2e649a nixos/lxcfs: fuse -> fuse3 2026-06-01 10:56:59 -04:00
nikstur
2bc1045adc jitterentropy-rngd: fix systemd service to allow mlock and restict ml… (#523359) 2026-06-01 14:27:43 +00:00
nixpkgs-ci[bot]
90f8f42740 Merge master into staging-nixos 2026-06-01 14:03:25 +00:00
Martin Weinelt
1f56fbcf9c nixos/tests/strichliste: migrate to nspawn container 2026-06-01 13:24:05 +02:00
Martin Weinelt
c1f4b82c3f strichliste: 2.0.1 -> 2.1.0
https://github.com/strichliste/strichliste/releases/tag/v2.1.0
https://github.com/strichliste/strichliste-web-frontend/releases/tag/v2.1.0

Co-Authored-By: Micha Ober <git@ober-mail.de>
2026-06-01 13:20:54 +02:00
Matt Sturgeon
05f0fc6f6a nixos/kernel_config: remove redundant mergeEqualOption (#525746) 2026-06-01 08:43:29 +00:00
Johannes Kirschbauer
e26bb57b73 nixos/displayManager: replace ad-hoc type // { check } overrides
Replace ad-hoc `type // { check }` overrides, which are incompatible
with the v2 merge mechanism (see #454964).
2026-06-01 10:43:01 +02:00
nixpkgs-ci[bot]
db581f6e08 Merge master into staging-nixos 2026-06-01 07:49:08 +00:00
Sizhe Zhao
f4bb29c620 nixos/limine: correct timeout logic (#523423) 2026-06-01 03:41:00 +00:00
Emily
38dec9fcff makeInitrd{,NG}: drop legacy U‐Boot image support
Now that ARMv5 no longer uses `uImage`, there’s no point in keeping
around support for this deprecated format that the rest of the NixOS
infrastructure doesn’t handle. Modern U‐Boot setups should not
be affected in any way by this.
2026-06-01 11:12:44 +10:00
nixpkgs-ci[bot]
274f5e4ccc Merge master into staging-nixos 2026-06-01 00:49:19 +00:00