[release-24.05] {zfs,zfsUnstable}: 2.2.4 -> 2.2.5

[Mic92]

Not cherry-picking here, because master has significantly refactored the zfs expression.

Description of changes

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:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• 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.11 Release Notes (or backporting 23.11 and 24.05 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.

[Mic92]

@ofborg test zfs

[Mic92]

Not sure if this was introduced by the bump:

error: builder for '/nix/store/8wp2ksx8bnd5k4makzdwpdcmf4rviyj5-vm-test-run-zfs_unstable.drv' failed with exit code 1;
       last 10 log lines:
       > machine # [   12.761422] rpcd_winreg[996]:   Copyright Andrew Tridgell and the Samba Team 1992-2024
       > machine # tstream_smbXcli_np_destructor: cli_close failed on pipe srvsvc. Error was NT_STATUS_INVALID_NETWORK_RESPONSE
       > machine # cli_rpc_pipe_open_noauth: rpc_pipe_bind for pipe srvsvc failed with error NT_STATUS_IO_TIMEOUT
       > machine: output:
       > Test "sharesmb works" failed with error: "command `smbclient -gNL localhost | grep rpool_shared_smb` failed (exit code 1)"
       > cleanup
       > kill machine (pid 47)
       > qemu-kvm: terminating on signal 15 from pid 6 (/nix/store/3wb0055984n2whn449hywsl4ag9gcjir-python3-3.11.9/bin/python3.11)
       > (finished: cleanup, in 0.04 seconds)
       > kill vlan (pid 7)
       For full logs, run 'nix-store -l /nix/store/8wp2ksx8bnd5k4makzdwpdcmf4rviyj5-vm-test-run-zfs_unstable.drv'.

[amarshall]

2.2.5 does not officially support 6.10, max is 6.9. (so this should be kernelOlder "6.10").

[amarshall]

Opened alternative PR #340074 that addresses my comment above while also pulling in another change to make future backports have fewer merge conflicts.

[amarshall]

Closing as #340074 is merged and supersedes this, feel free to reopen if you think this is in error.