zfs: use meta.broken instead of throw when incompatible with kernel #109029
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Atemu
added
the
9.needs: port to stable
NeQuissimus
approved these changes
Jan 11, 2021
hmenke
approved these changes
Jan 18, 2021
Atemu
force-pushed
the
zfs-meta.broken-instead-of-abort
branch
from
38ac730
to
e1d6849
Compare
Atemu
requested review from
FRidh,
jonringer,
kalbasit and
zowoq
as code owners
`throw` aborts eval when the package is touched in inappropriate places. See NixOS#109001 for an adverse instance of that. ZFS now behaves like a regular broken package when it's, you know, broken. It also still prints the helpful incompatibility notice when fully evaluated.
Atemu
force-pushed
the
zfs-meta.broken-instead-of-abort
branch
from
e1d6849
to
aa58df5
Compare
|
Whoops, accidentally tried to merge staging into master; sorry for the ping. Merge conflict fixed. |
ofborg
bot
added
10.rebuild-darwin: 1-10
10.rebuild-darwin: 1
10.rebuild-linux: 1-10
10.rebuild-linux: 1
and removed
10.rebuild-darwin: 0
10.rebuild-linux: 0
labels
|
safe for backporting. |
jonringer
reviewed
Jan 21, 2021
| @@ -174,6 +168,13 @@ let | |||
| license = licenses.cddl; | |||
| platforms = platforms.linux; | |||
| maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; | |||
| broken = if | |||
| buildKernel && (incompatibleKernelVersion != null) && versionAtLeast kernel.version incompatibleKernelVersion | |||
There was a problem hiding this comment.
Suggested change
| buildKernel && (incompatibleKernelVersion != null) && versionAtLeast kernel.version incompatibleKernelVersion | |
| buildKernel && (incompatibleKernelVersion != null) && kernel.kernelAtLeast incompatibleKernelVersion |
There was a problem hiding this comment.
LGTM, feel free to just push that.
Could you also do the backport to stable (staging?)? You'd probably be the one to merge my PR for that anyways ;)
There was a problem hiding this comment.
Although hold on, have we foreward-ported kernelAtLeast yet? You created that in staging IIRC.
There was a problem hiding this comment.
I should be there, I needed it to properly mark failing module builds
There was a problem hiding this comment.
[11:42:55] jon@jon-desktop /home/jon/projects/nixpkgs (release-20.09)
$ git pull
Already up to date.
[11:42:59] jon@jon-desktop /home/jon/projects/nixpkgs (release-20.09)
$ nix eval -f . linuxPackages.kernel.kernelAtLeast
<LAMBDA>
[11:43:17] jon@jon-desktop /home/jon/projects/nixpkgs (release-20.09)
$ git co master
Switched to branch 'master'
Your branch is behind 'origin/master' by 5 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
[11:43:46] jon@jon-desktop /home/jon/projects/nixpkgs (master)
$ nix eval -f . linuxPackages.kernel.kernelAtLeast
<LAMBDA>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
throw aborts eval when the package is touched in inappropriate places, see
#109001 for an adverse instance of that.
It now behaves like a regular broken package when it's, you know, broken.
It also still prints the helpful incompatibility notice.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)