[Backport release-23.11] zfs_2_2: 2.2.3 -> 2.2.4; zfs_unstable: 2.2.3-unstable-2024-04-09 -> 2.2.4 #309454
Conversation
numinit
force-pushed
the
backport-308642-to-release-23.11
branch
from
71d2596
to
ef03087
Compare
| hash = "sha256-6r5hQ/o7c4vq4Tfh0l1WbeK3AuPvi+1wzkwkIn1qEes="; | ||
| }) | ||
| ]; | ||
|
|
||
| nativeBuildInputs = [ cython ]; |
There was a problem hiding this comment.
main difference was cython vs cython_0
|
Not a show stopper, but you have rather managed to muddle up the contents of the commits compared to cherry-pick references, e.g. moved the fetchpatch addition from one commit to another. |
|
Thanks, I think I know what happened here. |
numinit
force-pushed
the
backport-308642-to-release-23.11
branch
from
ef03087
to
cec5812
Compare
|
The cherry-pick refs are still wrong, but this still looks otherwise OK. |
|
I just used:
And then fixed the patches prior to each I wonder if it's because it signed the merge commits with my GPG key afterwards... |
|
This is a big jump for the python library. Is this necessary for the zfs version updates? |
|
I thought about excluding it, but #308642 (comment) seemed to imply it was necessary. |
|
The patch for py-libzfs is definitely necessary, I didn鈥檛 try applying it to any older version. |
|
Let me give that a shot then. :-) |
No pre-release version at this moment, so use now-released 2.2.4. (cherry picked from commit 2cbe063)
Now compatible with Linux 6.8. https://github.com/openzfs/zfs/releases/tag/zfs-2.2.4 Need to patch py-libzfs to support incompatible API change. (cherry picked from commit a1dcb54)
|
It looks like it applies and builds fine. Re-running the NixOS tests just to be sure. |
numinit
force-pushed
the
backport-308642-to-release-23.11
branch
from
cec5812
to
8bc3807
Compare
|
All good. Pushed it up without the GPG sigs, we'll see if that works this time. |
numinit
changed the title
|
@ofborg build zfsUnstable.passthru.tests zfs.passthru.tests |
Description of changes
Manual backport of #308642 to 23.11 since Linux 6.8 was backported too.
Things done
nix-build zfsUnstable.passthru.tests -A zfs.passthru.testsnix-build -A python3Packages.py-libzfsMore tests pending.
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 馃憤 reaction to pull requests you find important.