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_2_1: 2.1.14 -> 2.1.15 #291822

Merged
merged 1 commit into from
Feb 28, 2024
Merged

zfs_2_1: 2.1.14 -> 2.1.15 #291822

merged 1 commit into from
Feb 28, 2024

Conversation

alyssais
Copy link
Member

Description of changes

This adds compatibility with newer kernels, which fixes nixosTests.zfs.series_2_1, which broke when the default kernel version was bumped.

This means we no longer need the removeLinuxDRM option at all, but I've kept it around as a no-op so people can leave it set in case the same thing happens again in future.

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.

This adds compatibility with newer kernels, which fixes
nixosTests.zfs.series_2_1, which broke when the default kernel version
was bumped.

This means we no longer need the removeLinuxDRM option at all, but
I've kept it around as a no-op so people can leave it set in case the
same thing happens again in future.
@RaitoBezarius RaitoBezarius merged commit e53c07f into NixOS:master Feb 28, 2024
25 of 26 checks passed
@alyssais alyssais deleted the zfs-2.1.15 branch February 28, 2024 12:06
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.

2 participants