Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zfs: update latestCompatibleLinuxPackages #291547

Merged
merged 1 commit into from
Feb 27, 2024

Conversation

alyssais
Copy link
Member

@alyssais alyssais commented Feb 26, 2024

Description of changes

ZFS no longer tries to use GPL-only symbols on aarch64.

Tested by building nixosTests.zfs.stable (modified to use Linux 6.6) and nixosTests.zfs.unstable.

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

ZFS no longer tries to use GPL-only symbols on aarch64.

Tested by building nixosTests.zfs.stable (modified to use Linux 6.6)
and nixosTests.zfs.unstable.
if stdenv'.isx86_64 || removeLinuxDRM
then kernel.kernelOlder "6.9"
else kernel.kernelOlder "6.2";
kernelCompatible = kernel.kernelOlder "6.9";
Copy link
Member

Choose a reason for hiding this comment

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

See also #291402

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, we'll get a conflict when one of these PRs merges. It's an orthogonal change though.

@vcunat vcunat mentioned this pull request Feb 26, 2024
13 tasks
Copy link
Member

@amarshall amarshall left a comment

Choose a reason for hiding this comment

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

Code seems good and reasonable. I do not have an aarch64 machine, so only did nix-build ---A pkgsCross.aarch64-multiplatform.linuxKernel.packages.linux_6_6.zfs to test module build.

@adamcstephens
Copy link
Contributor

Thanks, nice to see this finally cleaned up. :)

@adamcstephens adamcstephens merged commit 3a3f30d into NixOS:master Feb 27, 2024
29 of 30 checks passed
@alyssais alyssais deleted the zfs-linux-6.6-aarch64 branch February 27, 2024 11:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants