Skip to content

apple-t2 stable module fails to apply patches #2027

Description

@dignifiedalpaca

Applying the patches for the stable (that is, kernel version 6.18) version of the apple-t2 module here is failing. I’ve attached the linux-config logs here, but what looks to me like the most relevant portions are below:

Running phase: patchPhase
@nix { "action": "setPhase", "phase": "patchPhase" }
...
applying patch /nix/store/9wvm6sm41mns9fx84hlyinc3pk8vd5yg-3009-applesmc-battery-charge-limiter.patch
patching file drivers/hwmon/applesmc.c
applying patch /nix/store/srih4h40iz3p47699j8911hzkp8s7j5j-4001-asahi-trackpad.patch
...
Hunk #10 succeeded at 1421 (offset 77 lines).
patching file drivers/hid/hid-magicmouse.c
Hunk #1 succeeded at 1427 (offset 77 lines).
Hunk #2 FAILED at 1370.
1 out of 2 hunks FAILED -- saving rejects to file drivers/hid/hid-magicmouse.c.rej
patching file drivers/hid/hid-magicmouse.c
...

It looks like the issue might be in 4001-asahi-trackpad.patch, but I don’t see what could have changed, given that even though that patch was changed upstream recently, the apple-t2 module seems like it was last updated 3 months ago, so the kernel and the patches should all be the same.

Activity

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions