Skip to content

Comments

linuxPackages.xone: 0.3-unstable-2024-04-25 -> 0.3-unstable-2024-12-23; switch to dlundqvist fork, drop patches for newer kernels, add 'fazzi' as maintainer#384828

Merged
JohnRTitor merged 2 commits intoNixOS:masterfrom
fxzzi:xone-dlundqvist
Mar 25, 2025

Conversation

@fxzzi
Copy link
Contributor

@fxzzi fxzzi commented Feb 24, 2025

Currently, we are using upstream https://github.com/medusalix/xone as the source for our xone nixpkg. This has caused a few issues, like the fact that we have to pull in some patches ourselves to make the module successfully build for newer kernels (6.11+).

We should follow what the official xone support server is suggesting, which is to use dlundqvist's fork of the project.
image

This allows us to remove the patches we were originally applying (they are upstream in this fork), and also puts us on a more up to date path for the package. It is clear that the original repo is no longer being worked on, considering it hasn't had an update in 10 months, the creator's (medusalix) last message on the support server was on 2024/05/13, and the AUR package maintainer (which was previously me when I was running arch), has now moved the base package over to this fork as well. https://aur.archlinux.org/packages/xone-dkms-git

The comment from the new maintainer states:
image

This fork also contains a few minor changes including additional support for some devices, and some other minor fixes.

Finally, I have also added myself as a maintainer of this package, just in case the driver ever breaks again for a newer kernel release.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Feb 24, 2025
@nix-owners nix-owners bot requested a review from rhysmdnz February 24, 2025 18:29
Copy link
Contributor

@9999years 9999years left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for this!

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Feb 26, 2025
@JohnRTitor
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 384828

Logs: https://github.com/JohnRTitor/nixpkgs-review-gha/actions/runs/13920075762


x86_64-linux

⏩ 6 packages marked as broken and skipped:
  • linuxKernel.packages.linux_5_10.xone
  • linuxKernel.packages.linux_5_10_hardened.xone
  • linuxKernel.packages.linux_5_4.xone
  • linuxKernel.packages.linux_5_4_hardened.xone
  • linuxPackages_5_10_hardened.xone
  • linuxPackages_5_4_hardened.xone
✅ 17 packages built:
  • linuxKernel.packages.linux_5_15.xone
  • linuxPackages_5_15_hardened.xone (linuxKernel.packages.linux_5_15_hardened.xone)
  • linuxKernel.packages.linux_6_1.xone
  • linuxKernel.packages.linux_6_11.xone
  • linuxPackages_6_11_hardened.xone (linuxKernel.packages.linux_6_11_hardened.xone)
  • linuxPackages.xone (linuxKernel.packages.linux_6_12.xone)
  • linuxPackages_hardened.xone (linuxPackages_6_12_hardened.xone)
  • linuxPackages_latest.xone (linuxKernel.packages.linux_6_13.xone)
  • linuxPackages_6_1_hardened.xone (linuxKernel.packages.linux_6_1_hardened.xone)
  • linuxKernel.packages.linux_6_6.xone
  • linuxPackages_6_6_hardened.xone (linuxKernel.packages.linux_6_6_hardened.xone)
  • linuxPackages_latest-libre.xone (linuxKernel.packages.linux_latest_libre.xone)
  • linuxPackages-libre.xone (linuxKernel.packages.linux_libre.xone)
  • linuxPackages_lqx.xone (linuxKernel.packages.linux_lqx.xone)
  • linuxPackages_xanmod.xone (linuxKernel.packages.linux_xanmod.xone)
  • linuxPackages_xanmod_latest.xone (linuxKernel.packages.linux_xanmod_latest.xone, linuxPackages_xanmod_stable.xone)
  • linuxPackages_zen.xone (linuxKernel.packages.linux_zen.xone)

aarch64-linux

⏩ 16 packages marked as broken and skipped:
  • linuxKernel.packages.linux_5_10.xone
  • linuxKernel.packages.linux_5_10_hardened.xone
  • linuxKernel.packages.linux_5_4.xone
  • linuxKernel.packages.linux_5_4_hardened.xone
  • linuxKernel.packages.linux_lqx.xone
  • linuxKernel.packages.linux_xanmod.xone
  • linuxKernel.packages.linux_xanmod_latest.xone
  • linuxKernel.packages.linux_xanmod_stable.xone
  • linuxKernel.packages.linux_zen.xone
  • linuxPackages_5_10_hardened.xone
  • linuxPackages_5_4_hardened.xone
  • linuxPackages_lqx.xone
  • linuxPackages_xanmod.xone
  • linuxPackages_xanmod_latest.xone
  • linuxPackages_xanmod_stable.xone
  • linuxPackages_zen.xone
❌ 1 package failed to build:
  • linuxPackages_hardened.xone (linuxPackages_6_12_hardened.xone)
✅ 12 packages built:
  • linuxKernel.packages.linux_5_15.xone
  • linuxPackages_5_15_hardened.xone (linuxKernel.packages.linux_5_15_hardened.xone)
  • linuxKernel.packages.linux_6_1.xone
  • linuxKernel.packages.linux_6_11.xone
  • linuxPackages_6_11_hardened.xone (linuxKernel.packages.linux_6_11_hardened.xone)
  • linuxPackages.xone (linuxKernel.packages.linux_6_12.xone)
  • linuxPackages_latest.xone (linuxKernel.packages.linux_6_13.xone)
  • linuxPackages_6_1_hardened.xone (linuxKernel.packages.linux_6_1_hardened.xone)
  • linuxKernel.packages.linux_6_6.xone
  • linuxPackages_6_6_hardened.xone (linuxKernel.packages.linux_6_6_hardened.xone)
  • linuxPackages_latest-libre.xone (linuxKernel.packages.linux_latest_libre.xone)
  • linuxPackages-libre.xone (linuxKernel.packages.linux_libre.xone)

Copy link
Member

@Cryolitia Cryolitia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Member

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please separate each logical changes to individual commits.

@fxzzi
Copy link
Contributor Author

fxzzi commented Mar 25, 2025

Please separate each logical changes to individual commits.

Should be resolved by separating the commit where I add myself as a maintainer, and then the rest. Let me know if this works for you.

Copy link
Member

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nixfmt RFC style commit is very minimal (just one line) change? So you can just merge it with the last one.

Also change that commit's message to linuxPackages.xone: 0.3-unstable-2024-04-25 -> 0.3-unstable-2024-12-23 and explain why are you switching to the fork.

fxzzi added 2 commits March 25, 2025 15:41
switch to a fork of the original repo from dlundqvist. It already
contains commits to fix builds for 6.11+ kernels, and contains other
minor changes. This allows us to drop the patches which we were
previously applying. The upstream repo from medusalix seems to be abandoned,
and the maintainer of said repo hasn't had any communication on the
support discord server since March 2024.
@fxzzi
Copy link
Contributor Author

fxzzi commented Mar 25, 2025

Nixfmt RFC style commit is very minimal (just one line) change? So you can just merge it with the last one.

yeah I have no idea what even happened there and why the line was removed then added again right after. I've corrected it and squashed down to two commits.

Also change that commit's message to linuxPackages.xone: 0.3-unstable-2024-04-25 -> 0.3-unstable-2024-12-23 and explain why are you switching to the fork.

sure. lets hope i added the comment to the commit properly haha

@JohnRTitor JohnRTitor changed the title xone: switch to dlundqvist fork, drop patches for newer kernels, add 'fazzi' as maintainer linuxPackages.xone: 0.3-unstable-2024-04-25 -> 0.3-unstable-2024-12-23; switch to dlundqvist fork, drop patches for newer kernels, add 'fazzi' as maintainer Mar 25, 2025
@JohnRTitor
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 384828

Logs: https://github.com/JohnRTitor/nixpkgs-review-gha/actions/runs/14064254305


x86_64-linux

⏩ 6 packages marked as broken and skipped:
  • linuxKernel.packages.linux_5_10.xone
  • linuxKernel.packages.linux_5_10_hardened.xone
  • linuxKernel.packages.linux_5_4.xone
  • linuxKernel.packages.linux_5_4_hardened.xone
  • linuxPackages_5_10_hardened.xone
  • linuxPackages_5_4_hardened.xone
✅ 18 packages built:
  • linuxKernel.packages.linux_5_15.xone
  • linuxPackages_5_15_hardened.xone (linuxKernel.packages.linux_5_15_hardened.xone)
  • linuxKernel.packages.linux_6_1.xone
  • linuxPackages.xone (linuxKernel.packages.linux_6_12.xone)
  • linuxPackages_hardened.xone (linuxPackages_6_12_hardened.xone)
  • linuxKernel.packages.linux_6_13.xone
  • linuxPackages_6_13_hardened.xone (linuxKernel.packages.linux_6_13_hardened.xone)
  • linuxPackages_latest.xone (linuxKernel.packages.linux_6_14.xone)
  • linuxPackages_6_1_hardened.xone (linuxKernel.packages.linux_6_1_hardened.xone)
  • linuxKernel.packages.linux_6_6.xone
  • linuxPackages_6_6_hardened.xone (linuxKernel.packages.linux_6_6_hardened.xone)
  • linuxPackages_ham.xone (linuxKernel.packages.linux_ham.xone)
  • linuxPackages_latest-libre.xone (linuxKernel.packages.linux_latest_libre.xone)
  • linuxPackages-libre.xone (linuxKernel.packages.linux_libre.xone)
  • linuxPackages_lqx.xone (linuxKernel.packages.linux_lqx.xone)
  • linuxPackages_xanmod.xone (linuxKernel.packages.linux_xanmod.xone)
  • linuxPackages_xanmod_latest.xone (linuxKernel.packages.linux_xanmod_latest.xone, linuxPackages_xanmod_stable.xone)
  • linuxPackages_zen.xone (linuxKernel.packages.linux_zen.xone)

aarch64-linux

⏩ 16 packages marked as broken and skipped:
  • linuxKernel.packages.linux_5_10.xone
  • linuxKernel.packages.linux_5_10_hardened.xone
  • linuxKernel.packages.linux_5_4.xone
  • linuxKernel.packages.linux_5_4_hardened.xone
  • linuxKernel.packages.linux_lqx.xone
  • linuxKernel.packages.linux_xanmod.xone
  • linuxKernel.packages.linux_xanmod_latest.xone
  • linuxKernel.packages.linux_xanmod_stable.xone
  • linuxKernel.packages.linux_zen.xone
  • linuxPackages_5_10_hardened.xone
  • linuxPackages_5_4_hardened.xone
  • linuxPackages_lqx.xone
  • linuxPackages_xanmod.xone
  • linuxPackages_xanmod_latest.xone
  • linuxPackages_xanmod_stable.xone
  • linuxPackages_zen.xone
✅ 14 packages built:
  • linuxKernel.packages.linux_5_15.xone
  • linuxPackages_5_15_hardened.xone (linuxKernel.packages.linux_5_15_hardened.xone)
  • linuxKernel.packages.linux_6_1.xone
  • linuxPackages.xone (linuxKernel.packages.linux_6_12.xone)
  • linuxPackages_hardened.xone (linuxPackages_6_12_hardened.xone)
  • linuxKernel.packages.linux_6_13.xone
  • linuxPackages_6_13_hardened.xone (linuxKernel.packages.linux_6_13_hardened.xone)
  • linuxPackages_latest.xone (linuxKernel.packages.linux_6_14.xone)
  • linuxPackages_6_1_hardened.xone (linuxKernel.packages.linux_6_1_hardened.xone)
  • linuxKernel.packages.linux_6_6.xone
  • linuxPackages_6_6_hardened.xone (linuxKernel.packages.linux_6_6_hardened.xone)
  • linuxPackages_ham.xone (linuxKernel.packages.linux_ham.xone)
  • linuxPackages_latest-libre.xone (linuxKernel.packages.linux_latest_libre.xone)
  • linuxPackages-libre.xone (linuxKernel.packages.linux_libre.xone)

@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one person. label Mar 25, 2025
@JohnRTitor JohnRTitor merged commit c153470 into NixOS:master Mar 25, 2025
31 of 35 checks passed
@fxzzi fxzzi deleted the xone-dlundqvist branch March 28, 2025 19:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants