fix: unbreak gaia and spdr builds after the flake.lock update

[devusb]

Stacked on #111, which is now just the flake.lock update. This carries everything needed to make that update build.

karakeep

Drops the nodejs_22 override now that the nixpkgs change it was waiting on has landed.

gaia0 / gaia1

nixos-hardware removed hardware.raspberry-pi."4".poe-plus-hat in favour of the stock firmware overlay, which fails evaluation with an assertion.

Besides the overlay itself, that module also set apply-overlays-dtmerge.enable and hardware.deviceTree.filter, so both are now set explicitly. The vendored PoE+ overlay and the mkForce on deviceTree.overlays are unchanged, keeping the resulting device tree identical to main.

Note: the mkForce is load-bearing — it discards the dwc2, fkms-3d and audio overlays that gaia1.nix enables, 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 for HID_TYPE_USBMOUSE; t2 re-enables multitouch for BUS_SPI). 4001-asahi-trackpad.patch therefore both duplicates the function and fails on the driver struct, and 4004/4005 build on it.

nixos-hardware is already at master and t2linux's 6.18 branch carries the identical patch, so there is no fix upstream to pick up yet. kernelChannel = "latest" is not an option either, since linux_7_0 has 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.nix appends rather than replaces kernelPatches, so the list is filtered through patchesFile; it is passed via builtins.toFile because generic.nix reads 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-doctor and treefmt on both systems.

[devusb]

Stacked on #111, which is now just the flake.lock update. This carries everything needed to make that update build.

karakeep

Drops the nodejs_22 override now that the nixpkgs change it was waiting on has landed.

gaia0 / gaia1

nixos-hardware removed hardware.raspberry-pi."4".poe-plus-hat in favour of the stock firmware overlay, which fails evaluation with an assertion.

Besides the overlay itself, that module also set apply-overlays-dtmerge.enable and hardware.deviceTree.filter, so both are now set explicitly. The vendored PoE+ overlay and the mkForce on deviceTree.overlays are unchanged, keeping the resulting device tree identical to main.

Note: the mkForce is load-bearing — it discards the dwc2, fkms-3d and audio overlays that gaia1.nix enables, 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 for HID_TYPE_USBMOUSE; t2 re-enables multitouch for BUS_SPI). 4001-asahi-trackpad.patch therefore both duplicates the function and fails on the driver struct, and 4004/4005 build on it.

nixos-hardware is already at master and t2linux's 6.18 branch carries the identical patch, so there is no fix upstream to pick up yet. kernelChannel = "latest" is not an option either, since linux_7_0 has 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.nix appends rather than replaces kernelPatches, so the list is filtered through patchesFile; it is passed via builtins.toFile because generic.nix reads 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-doctor and treefmt on both systems.

[devusb]

Stacked on #111, which is now just the flake.lock update. This carries everything needed to make that update build.

karakeep

Drops the nodejs_22 override now that the nixpkgs change it was waiting on has landed.

gaia0 / gaia1

nixos-hardware removed hardware.raspberry-pi."4".poe-plus-hat in favour of the stock firmware overlay, which fails evaluation with an assertion.

Besides the overlay itself, that module also set apply-overlays-dtmerge.enable and hardware.deviceTree.filter, so both are now set explicitly. The vendored PoE+ overlay and the mkForce on deviceTree.overlays are unchanged, keeping the resulting device tree identical to main.

Note: the mkForce is load-bearing — it discards the dwc2, fkms-3d and audio overlays that gaia1.nix enables, 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 for HID_TYPE_USBMOUSE; t2 re-enables multitouch for BUS_SPI). 4001-asahi-trackpad.patch therefore both duplicates the function and fails on the driver struct, and 4004/4005 build on it.

nixos-hardware is already at master and t2linux's 6.18 branch carries the identical patch, so there is no fix upstream to pick up yet. kernelChannel = "latest" is not an option either, since linux_7_0 has 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.nix appends rather than replaces kernelPatches, so the list is filtered through patchesFile; it is passed via builtins.toFile because generic.nix reads 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-doctor and treefmt on both systems.

[devusb]

Stacked on #111, which is now just the flake.lock update. This carries everything needed to make that update build.

karakeep

Drops the nodejs_22 override now that the nixpkgs change it was waiting on has landed.

gaia0 / gaia1

nixos-hardware removed hardware.raspberry-pi."4".poe-plus-hat in favour of the stock firmware overlay, which fails evaluation with an assertion.

Besides the overlay itself, that module also set apply-overlays-dtmerge.enable and hardware.deviceTree.filter, so both are now set explicitly. The vendored PoE+ overlay and the mkForce on deviceTree.overlays are unchanged, keeping the resulting device tree identical to main.

Note: the mkForce is load-bearing — it discards the dwc2, fkms-3d and audio overlays that gaia1.nix enables, 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 for HID_TYPE_USBMOUSE; t2 re-enables multitouch for BUS_SPI). 4001-asahi-trackpad.patch therefore both duplicates the function and fails on the driver struct, and 4004/4005 build on it.

nixos-hardware is already at master and t2linux's 6.18 branch carries the identical patch, so there is no fix upstream to pick up yet. kernelChannel = "latest" is not an option either, since linux_7_0 has 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.nix appends rather than replaces kernelPatches, so the list is filtered through patchesFile; it is passed via builtins.toFile because generic.nix reads 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-doctor and treefmt on both systems.

[devusb]

Stacked on #111, which is now just the flake.lock update. This carries everything needed to make that update build.

karakeep

Drops the nodejs_22 override now that the nixpkgs change it was waiting on has landed.

gaia0 / gaia1

nixos-hardware removed hardware.raspberry-pi."4".poe-plus-hat in favour of the stock firmware overlay, which fails evaluation with an assertion.

Besides the overlay itself, that module also set apply-overlays-dtmerge.enable and hardware.deviceTree.filter, so both are now set explicitly. The vendored PoE+ overlay and the mkForce on deviceTree.overlays are unchanged, keeping the resulting device tree identical to main.

Note: the mkForce is load-bearing — it discards the dwc2, fkms-3d and audio overlays that gaia1.nix enables, 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 for HID_TYPE_USBMOUSE; t2 re-enables multitouch for BUS_SPI). 4001-asahi-trackpad.patch therefore both duplicates the function and fails on the driver struct, and 4004/4005 build on it.

nixos-hardware is already at master and t2linux's 6.18 branch carries the identical patch, so there is no fix upstream to pick up yet. kernelChannel = "latest" is not an option either, since linux_7_0 has 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.nix appends rather than replaces kernelPatches, so the list is filtered through patchesFile; it is passed via builtins.toFile because generic.nix reads 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-doctor and treefmt on both systems.

[devusb]

Stacked on #111, which is now just the flake.lock update. This carries everything needed to make that update build.

karakeep

Drops the nodejs_22 override now that the nixpkgs change it was waiting on has landed.

gaia0 / gaia1

nixos-hardware removed hardware.raspberry-pi."4".poe-plus-hat in favour of the stock firmware overlay, which fails evaluation with an assertion.

Besides the overlay itself, that module also set apply-overlays-dtmerge.enable and hardware.deviceTree.filter, so both are now set explicitly. The vendored PoE+ overlay and the mkForce on deviceTree.overlays are unchanged, keeping the resulting device tree identical to main.

Note: the mkForce is load-bearing — it discards the dwc2, fkms-3d and audio overlays that gaia1.nix enables, 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 for HID_TYPE_USBMOUSE; t2 re-enables multitouch for BUS_SPI). 4001-asahi-trackpad.patch therefore both duplicates the function and fails on the driver struct, and 4004/4005 build on it.

nixos-hardware is already at master and t2linux's 6.18 branch carries the identical patch, so there is no fix upstream to pick up yet. kernelChannel = "latest" is not an option either, since linux_7_0 has 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.nix appends rather than replaces kernelPatches, so the list is filtered through patchesFile; it is passed via builtins.toFile because generic.nix reads 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-doctor and treefmt on both systems.

[devusb]

Stacked on #111, which is now just the flake.lock update. This carries everything needed to make that update build.

karakeep

Drops the nodejs_22 override now that the nixpkgs change it was waiting on has landed.

gaia0 / gaia1

nixos-hardware removed hardware.raspberry-pi."4".poe-plus-hat in favour of the stock firmware overlay, which fails evaluation with an assertion.

Besides the overlay itself, that module also set apply-overlays-dtmerge.enable and hardware.deviceTree.filter, so both are now set explicitly. The vendored PoE+ overlay and the mkForce on deviceTree.overlays are unchanged, keeping the resulting device tree identical to main.

Note: the mkForce is load-bearing — it discards the dwc2, fkms-3d and audio overlays that gaia1.nix enables, 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 for HID_TYPE_USBMOUSE; t2 re-enables multitouch for BUS_SPI). 4001-asahi-trackpad.patch therefore both duplicates the function and fails on the driver struct, and 4004/4005 build on it.

nixos-hardware is already at master and t2linux's 6.18 branch carries the identical patch, so there is no fix upstream to pick up yet. kernelChannel = "latest" is not an option either, since linux_7_0 has 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.nix appends rather than replaces kernelPatches, so the list is filtered through patchesFile; it is passed via builtins.toFile because generic.nix reads 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-doctor and treefmt on both systems.

[devusb]

Stacked on #111, which is now just the flake.lock update. This carries everything needed to make that update build.

karakeep

Drops the nodejs_22 override now that the nixpkgs change it was waiting on has landed.

gaia0 / gaia1

nixos-hardware removed hardware.raspberry-pi."4".poe-plus-hat in favour of the stock firmware overlay, which fails evaluation with an assertion.

Besides the overlay itself, that module also set apply-overlays-dtmerge.enable and hardware.deviceTree.filter, so both are now set explicitly. The vendored PoE+ overlay and the mkForce on deviceTree.overlays are unchanged, keeping the resulting device tree identical to main.

Note: the mkForce is load-bearing — it discards the dwc2, fkms-3d and audio overlays that gaia1.nix enables, 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 for HID_TYPE_USBMOUSE; t2 re-enables multitouch for BUS_SPI). 4001-asahi-trackpad.patch therefore both duplicates the function and fails on the driver struct, and 4004/4005 build on it.

nixos-hardware is already at master and t2linux's 6.18 branch carries the identical patch, so there is no fix upstream to pick up yet. kernelChannel = "latest" is not an option either, since linux_7_0 has 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.nix appends rather than replaces kernelPatches, so the list is filtered through patchesFile; it is passed via builtins.toFile because generic.nix reads 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-doctor and treefmt on both systems.