fix: unbreak gaia and spdr builds after the flake.lock update - #116
Open
devusb wants to merge 4 commits into
Open
fix: unbreak gaia and spdr builds after the flake.lock update#116devusb wants to merge 4 commits into
devusb wants to merge 4 commits into
Conversation
nixos-hardware removed hardware.raspberry-pi."4".poe-plus-hat in favor of the stock firmware overlay. Set the apply-overlays-dtmerge and deviceTree filter values that module supplied so the vendored PoE+ overlay keeps being applied as before.
Kernel 6.18.47 backported its own magicmouse reset_resume handling, so the asahi trackpad patch and the two magicmouse patches built on it no longer apply. Build the t2 kernel from a patch list with those three removed; spdr runs headless and does not need the trackpad support they add.
Both options only contribute device tree overlays, which the mkForce on hardware.deviceTree.overlays in fan-control.nix discards. The audio module's only other effect is a pulseaudio config override, and pulseaudio is not in use here. The system closure is unchanged.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Stacked on #111, which is now just the
flake.lockupdate. This carries everything needed to make that update build.karakeep
Drops the
nodejs_22override now that the nixpkgs change it was waiting on has landed.gaia0 / gaia1
nixos-hardwareremovedhardware.raspberry-pi."4".poe-plus-hatin favour of the stock firmware overlay, which fails evaluation with an assertion.Besides the overlay itself, that module also set
apply-overlays-dtmerge.enableandhardware.deviceTree.filter, so both are now set explicitly. The vendored PoE+ overlay and themkForceondeviceTree.overlaysare unchanged, keeping the resulting device tree identical tomain.Note: the
mkForceis load-bearing — it discards thedwc2,fkms-3dandaudiooverlays thatgaia1.nixenables, one of which (audio-on-overlay) does not apply. That behaviour predates this change and is left alone here.spdr
Kernel 6.18.47 backported its own
magicmouse_reset_resume, which differs from the one the t2 patch set adds (upstream defers via delayed work forHID_TYPE_USBMOUSE; t2 re-enables multitouch forBUS_SPI).4001-asahi-trackpad.patchtherefore both duplicates the function and fails on the driver struct, and4004/4005build on it.nixos-hardwareis already at master and t2linux's6.18branch carries the identical patch, so there is no fix upstream to pick up yet.kernelChannel = "latest"is not an option either, sincelinux_7_0has been removed from nixpkgs as EOL.The t2 kernel is now built from a patch list with those three patches removed. spdr runs headless, so the trackpad support they provide is not needed.
generic.nixappends rather than replaceskernelPatches, so the list is filtered throughpatchesFile; it is passed viabuiltins.toFilebecausegeneric.nixreads it at evaluation time.Verification
All ten flake checks build:
nixos-chopper,nixos-spdr,sophia,nixos-gaia0,nixos-gaia1,nixos-sophia,nixos-superintendent,nixos-the-doctorandtreefmton both systems.