[20.09] Backport ZFS update in preparation for 5.10 bump#108944
[20.09] Backport ZFS update in preparation for 5.10 bump#108944NeQuissimus merged 3 commits intoNixOS:release-20.09from
Conversation
|
nixosTests.zfs.unstable is failing for some reason, it seems like boot.zfs.enableUnstable which the test uses has no effect? O.o |
|
@ofborg test zfs.unstable |
|
@Atemu The test passes for me locally: |
|
Did you merge your kernel bump locally too? The zfsStable it (erroneously) uses is still compatible with the current _latest = 5.9. Does the test use 0.8.6 or 2.0.1 on your machine? (grep the log, ZFS prints its version) |
|
@Atemu I misunderstood. I thought this PR alone would break the test. Let me see... |
|
I see what you mean. It seems there is an issue with how the test is evaluated. Regardless of |
|
@Atemu Can you post the error message? I actually don't see why it should fail here. The userspace tool in the system environment should be the one from unstable as well. |
|
From what I can tell (I am running zfsUnstable for my root), the user space tools are indeed 2.0.x. However, part of the issue is that the stable tools are still evaluated, which causes errors from the assertions when |
jonringer
left a comment
There was a problem hiding this comment.
LGTM, as this is effectively just bumping the unstable version from 2.0.0 to 2.0.1
future facing, we may want to leverage my kernelOlder and kernelAtLeast function to determine the compatible range. The current logic of specifying only one version seems very limited.
|
Reminder: Please review! This Pull Request is awaiting review. If you are the assigned reviewer, please have a look. Try to find another reviewer if necessary. If you can't, please say so. If the status is not accurate, please change it. If nothing happens, this PR Note: This feature is currently broken. The bot will not actually change the status. If you see this message multiple times, please request a status change manually. |
|
Hm, now it's duplicated across release-20.09 (this PR) and staging-20.09 (c021683). But I guess that won't be a problem, since they're the same thing. |
Motivation for this change
#108609 (review)
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)