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: add latestCompatibleLinuxPackages option #126980

Merged
merged 2 commits into from
Aug 4, 2021

Conversation

jonringer
Copy link
Contributor

@jonringer jonringer commented Jun 15, 2021

Motivation for this change

It's been brought up that people would like some way to more easily determine the latest compatible version with zfs.

This is a compromise in not being able to do so at all, to being able to determine the latest given all module restrictions. Just add something specifically to zfs itself.

example usage:

  boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackges;
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.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.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jun 15, 2021
@happysalada
Copy link
Contributor

This Looks good to me.
Are you waiting for more people to have a look?
I am in favor of merging it.

@jonringer jonringer requested review from NeQuissimus and hmenke June 17, 2021 14:17
@hmenke
Copy link
Member

hmenke commented Jun 22, 2021

I saw people repeatedly asking for this, so a backport is probably a good idea.

@jonringer
Copy link
Contributor Author

I should probably add a release note, otherwise I think it's merge-able

Copy link
Member

@Atemu Atemu left a comment

Choose a reason for hiding this comment

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

Not as general as @xaverdh's solution but a net improvement and definitely not controversial.
Should a more general solution land later, it should be simple to implement this special case with it.

Needs a rebase @jonringer but after that it's ready to merge IMO.

pkgs/os-specific/linux/zfs/default.nix Outdated Show resolved Hide resolved
@jansol
Copy link
Contributor

jansol commented Jul 3, 2021

Looks like it's config.boot.zfs.package.latestCompatibleLinuxPackges now.

@jonringer jonringer force-pushed the latest-zfs-packages branch 2 times, most recently from f99b568 to 6115168 Compare July 6, 2021 01:37
@jonringer jonringer requested a review from ryantm as a code owner July 6, 2021 01:42
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation labels Jul 6, 2021
@jonringer jonringer force-pushed the latest-zfs-packages branch from b88b1ca to 3fad103 Compare July 6, 2021 01:49
@ofborg ofborg bot added 10.rebuild-linux: 1-10 and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jul 6, 2021
@jansol
Copy link
Contributor

jansol commented Jul 21, 2021

Can we get this merged? I'd appreciate getting away from using a frankenbuild of unstable/master/PRs soon.

@jonringer jonringer force-pushed the latest-zfs-packages branch from 3fad103 to f6ad3e1 Compare July 21, 2021 19:18
@happysalada
Copy link
Contributor

@jonringer do you need more feedback on this one? Or is there anything that can be done to help?
also looking forward to this PR.

@jonringer
Copy link
Contributor Author

I'll resolve the conflicts then merge when ofborg is green.

@jonringer jonringer force-pushed the latest-zfs-packages branch from f6ad3e1 to fd7dcd2 Compare August 4, 2021 19:22
@jonringer
Copy link
Contributor Author

going to wait for ofborg

@jonringer jonringer merged commit f1de8c0 into NixOS:master Aug 4, 2021
@jonringer jonringer deleted the latest-zfs-packages branch August 4, 2021 19:57
@github-actions
Copy link
Contributor

github-actions bot commented Aug 4, 2021

Backport failed for release-21.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-21.05
git worktree add -d .worktree/backport-126980-to-release-21.05 origin/release-21.05
cd .worktree/backport-126980-to-release-21.05
git checkout -b backport-126980-to-release-21.05
ancref=$(git merge-base e8a41956a7a1ffed308d497f456d25bb2d3a5dbe fd7dcd2cf4ada16d40a39856204fc2b8f16a4aed)
git cherry-pick -x $ancref..fd7dcd2cf4ada16d40a39856204fc2b8f16a4aed

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/package-zfs-kernel-2-0-5-5-14-5-is-marked-as-broken-refusing-to-evaluate/15139/5

@hmenke hmenke mentioned this pull request Oct 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants