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_2_2: 2.2.4 -> 2.2.5 #332848

Merged
merged 2 commits into from
Aug 7, 2024
Merged

zfs_2_2: 2.2.4 -> 2.2.5 #332848

merged 2 commits into from
Aug 7, 2024

Conversation

amarshall
Copy link
Member

@amarshall amarshall commented Aug 6, 2024

Description of changes

Update zfs_unstable to match as well.

Things done

Result of nixpkgs-review run on x86_64-linux 1

8 packages marked as broken and skipped:
  • libvmi
  • linuxKernel.packages.linux_6_10.zfs
  • linuxKernel.packages.linux_latest_libre.zfs
  • linuxKernel.packages.linux_zen.zfs
  • nixops_unstablePlugins.nixops-libvirtd
  • nixops_unstablePlugins.nixops-libvirtd.dist
  • nixops_unstable_full
  • nixops_unstable_full.dist
15 packages failed to build:
  • ceph
  • ceph-client
  • ceph-csi
  • ceph.dev
  • ceph.doc
  • libceph (ceph.lib ,libceph.dev ,libceph.doc ,libceph.lib ,libceph.man)
  • ceph.man
  • qemu_full
  • qemu_full.debug
  • qemu_full.ga
  • quickemu
  • quickgui
  • samba4Full
  • samba4Full.dev
  • samba4Full.man
87 packages built:
  • appvm
  • booster
  • check_zfs
  • collectd
  • diffoscope
  • diffoscope.dist
  • diffoscope.man
  • docker-machine-kvm2
  • easysnap
  • facter
  • gnome.gnome-boxes
  • guestfs-tools
  • htcondor
  • kdePackages.kpmcore
  • kdePackages.kpmcore.debug
  • kdePackages.kpmcore.dev
  • kdePackages.kpmcore.devtools
  • kdePackages.partitionmanager
  • kdePackages.partitionmanager.debug
  • kdePackages.partitionmanager.dev
  • kdePackages.partitionmanager.devtools
  • libguestfs
  • libguestfs-with-appliance
  • librenms
  • libsForQt5.partitionmanager
  • libvirt
  • libvirt-glib
  • libvirt-glib.dev
  • libvirt-glib.devdoc
  • linuxKernel.packages.linux_4_19.zfs (linuxKernel.packages.linux_4_19.zfs_unstable)
  • linuxKernel.packages.linux_4_19_hardened.zfs (linuxKernel.packages.linux_4_19_hardened.zfs_unstable)
  • linuxKernel.packages.linux_5_10.zfs (linuxKernel.packages.linux_5_10.zfs_unstable)
  • linuxKernel.packages.linux_5_10_hardened.zfs (linuxKernel.packages.linux_5_10_hardened.zfs_unstable)
  • linuxKernel.packages.linux_5_15.zfs (linuxKernel.packages.linux_5_15.zfs_unstable)
  • linuxKernel.packages.linux_5_15_hardened.zfs (linuxKernel.packages.linux_5_15_hardened.zfs_unstable)
  • linuxKernel.packages.linux_5_4.zfs (linuxKernel.packages.linux_5_4.zfs_unstable)
  • linuxKernel.packages.linux_5_4_hardened.zfs (linuxKernel.packages.linux_5_4_hardened.zfs_unstable)
  • linuxKernel.packages.linux_6_1.zfs (linuxKernel.packages.linux_6_1.zfs_unstable)
  • linuxKernel.packages.linux_6_10.zfs_unstable
  • linuxKernel.packages.linux_6_1_hardened.zfs (linuxKernel.packages.linux_6_1_hardened.zfs_unstable)
  • linuxKernel.packages.linux_6_6.zfs (linuxKernel.packages.linux_6_6.zfs_unstable)
  • linuxKernel.packages.linux_hardened.zfs (linuxKernel.packages.linux_6_6_hardened.zfs ,linuxKernel.packages.linux_hardened.zfs_unstable)
  • linuxKernel.packages.linux_6_8.zfs (linuxKernel.packages.linux_6_8.zfs_unstable)
  • linuxKernel.packages.linux_6_8_hardened.zfs (linuxKernel.packages.linux_6_8_hardened.zfs_unstable)
  • linuxKernel.packages.linux_6_9.zfs (linuxKernel.packages.linux_6_9.zfs_unstable)
  • linuxKernel.packages.linux_6_9_hardened.zfs (linuxKernel.packages.linux_6_9_hardened.zfs_unstable)
  • linuxKernel.packages.linux_latest_libre.zfs_unstable
  • linuxKernel.packages.linux_libre.zfs (linuxKernel.packages.linux_libre.zfs_unstable)
  • linuxKernel.packages.linux_lqx.zfs (linuxKernel.packages.linux_lqx.zfs_unstable)
  • linuxKernel.packages.linux_xanmod.zfs (linuxKernel.packages.linux_xanmod.zfs_unstable)
  • linuxKernel.packages.linux_xanmod_latest.zfs (linuxKernel.packages.linux_xanmod_latest.zfs_unstable ,linuxKernel.packages.linux_xanmod_stable.zfs ,linuxKernel.packages.linux_xanmod_stable.zfs_unstable)
  • linuxKernel.packages.linux_zen.zfs_unstable
  • mgmt
  • minikube
  • multipass
  • ocamlPackages.ocaml_libvirt
  • perl536Packages.SysVirt
  • perl536Packages.SysVirt.devdoc
  • perl538Packages.SysVirt
  • perl538Packages.SysVirt.devdoc
  • python311Packages.guestfs
  • python311Packages.guestfs.dist
  • python311Packages.libvirt
  • python311Packages.libvirt.dist
  • python311Packages.py-libzfs
  • python311Packages.py-libzfs.dist
  • python312Packages.guestfs
  • python312Packages.guestfs.dist
  • python312Packages.libvirt
  • python312Packages.libvirt.dist
  • python312Packages.py-libzfs
  • python312Packages.py-libzfs.dist
  • rubyPackages.ruby-libvirt
  • rubyPackages_3_2.ruby-libvirt
  • rubyPackages_3_3.ruby-libvirt
  • sanoid
  • vagrant
  • virt-manager
  • virt-manager-qt
  • virt-manager.dist
  • virt-top
  • virt-viewer
  • zfs (zfs_unstable)
  • zfs.dev (zfs_unstable.dev)
  • zfstools
  • zpool-auto-expand-partitions
  • zxfer
  • 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:
  • 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.

@amarshall amarshall marked this pull request as ready for review August 6, 2024 23:53
@adamcstephens
Copy link
Contributor

Some of the failed builds seem concerning? Or are they already broken?

@toastal
Copy link
Contributor

toastal commented Aug 7, 2024

Closes unreviewed #331980

@toastal toastal mentioned this pull request Aug 7, 2024
13 tasks

isUnstable = true;
tests = [
nixosTests.zfs.unstable
];

# 6.10 patches approved+merged to the default branch, not in staging yet
Copy link
Contributor

Choose a reason for hiding this comment

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

I checked & these patches do appear in the changelog as merged 👍‍

@amarshall
Copy link
Member Author

Yea I believe I had a system resource problem. I had rerun a few of the failures and they succeeded, but now just did nixpkgs-review again after a reboot and much improved.


Result of nixpkgs-review run on x86_64-linux 1

8 packages marked as broken and skipped:
  • libvmi
  • linuxKernel.packages.linux_6_10.zfs
  • linuxKernel.packages.linux_latest_libre.zfs
  • linuxKernel.packages.linux_zen.zfs
  • nixops_unstablePlugins.nixops-libvirtd
  • nixops_unstablePlugins.nixops-libvirtd.dist
  • nixops_unstable_full
  • nixops_unstable_full.dist
102 packages built:
  • appvm
  • booster
  • ceph
  • ceph-client
  • ceph-csi
  • ceph.dev
  • ceph.doc
  • libceph (ceph.lib ,libceph.dev ,libceph.doc ,libceph.lib ,libceph.man)
  • ceph.man
  • check_zfs
  • collectd
  • diffoscope
  • diffoscope.dist
  • diffoscope.man
  • docker-machine-kvm2
  • easysnap
  • facter
  • gnome.gnome-boxes
  • guestfs-tools
  • htcondor
  • kdePackages.kpmcore
  • kdePackages.kpmcore.debug
  • kdePackages.kpmcore.dev
  • kdePackages.kpmcore.devtools
  • kdePackages.partitionmanager
  • kdePackages.partitionmanager.debug
  • kdePackages.partitionmanager.dev
  • kdePackages.partitionmanager.devtools
  • libguestfs
  • libguestfs-with-appliance
  • librenms
  • libsForQt5.partitionmanager
  • libvirt
  • libvirt-glib
  • libvirt-glib.dev
  • libvirt-glib.devdoc
  • linuxKernel.packages.linux_4_19.zfs (linuxKernel.packages.linux_4_19.zfs_unstable)
  • linuxKernel.packages.linux_4_19_hardened.zfs (linuxKernel.packages.linux_4_19_hardened.zfs_unstable)
  • linuxKernel.packages.linux_5_10.zfs (linuxKernel.packages.linux_5_10.zfs_unstable)
  • linuxKernel.packages.linux_5_10_hardened.zfs (linuxKernel.packages.linux_5_10_hardened.zfs_unstable)
  • linuxKernel.packages.linux_5_15.zfs (linuxKernel.packages.linux_5_15.zfs_unstable)
  • linuxKernel.packages.linux_5_15_hardened.zfs (linuxKernel.packages.linux_5_15_hardened.zfs_unstable)
  • linuxKernel.packages.linux_5_4.zfs (linuxKernel.packages.linux_5_4.zfs_unstable)
  • linuxKernel.packages.linux_5_4_hardened.zfs (linuxKernel.packages.linux_5_4_hardened.zfs_unstable)
  • linuxKernel.packages.linux_6_1.zfs (linuxKernel.packages.linux_6_1.zfs_unstable)
  • linuxKernel.packages.linux_6_10.zfs_unstable
  • linuxKernel.packages.linux_6_1_hardened.zfs (linuxKernel.packages.linux_6_1_hardened.zfs_unstable)
  • linuxKernel.packages.linux_6_6.zfs (linuxKernel.packages.linux_6_6.zfs_unstable)
  • linuxKernel.packages.linux_hardened.zfs (linuxKernel.packages.linux_6_6_hardened.zfs ,linuxKernel.packages.linux_hardened.zfs_unstable)
  • linuxKernel.packages.linux_6_8.zfs (linuxKernel.packages.linux_6_8.zfs_unstable)
  • linuxKernel.packages.linux_6_8_hardened.zfs (linuxKernel.packages.linux_6_8_hardened.zfs_unstable)
  • linuxKernel.packages.linux_6_9.zfs (linuxKernel.packages.linux_6_9.zfs_unstable)
  • linuxKernel.packages.linux_6_9_hardened.zfs (linuxKernel.packages.linux_6_9_hardened.zfs_unstable)
  • linuxKernel.packages.linux_latest_libre.zfs_unstable
  • linuxKernel.packages.linux_libre.zfs (linuxKernel.packages.linux_libre.zfs_unstable)
  • linuxKernel.packages.linux_lqx.zfs (linuxKernel.packages.linux_lqx.zfs_unstable)
  • linuxKernel.packages.linux_xanmod.zfs (linuxKernel.packages.linux_xanmod.zfs_unstable)
  • linuxKernel.packages.linux_xanmod_latest.zfs (linuxKernel.packages.linux_xanmod_latest.zfs_unstable ,linuxKernel.packages.linux_xanmod_stable.zfs ,linuxKernel.packages.linux_xanmod_stable.zfs_unstable)
  • linuxKernel.packages.linux_zen.zfs_unstable
  • mgmt
  • minikube
  • multipass
  • ocamlPackages.ocaml_libvirt
  • perl536Packages.SysVirt
  • perl536Packages.SysVirt.devdoc
  • perl538Packages.SysVirt
  • perl538Packages.SysVirt.devdoc
  • python311Packages.guestfs
  • python311Packages.guestfs.dist
  • python311Packages.libvirt
  • python311Packages.libvirt.dist
  • python311Packages.py-libzfs
  • python311Packages.py-libzfs.dist
  • python312Packages.guestfs
  • python312Packages.guestfs.dist
  • python312Packages.libvirt
  • python312Packages.libvirt.dist
  • python312Packages.py-libzfs
  • python312Packages.py-libzfs.dist
  • qemu_full
  • qemu_full.debug
  • qemu_full.ga
  • quickemu
  • quickgui
  • rubyPackages.ruby-libvirt
  • rubyPackages_3_2.ruby-libvirt
  • rubyPackages_3_3.ruby-libvirt
  • samba4Full
  • samba4Full.dev
  • samba4Full.man
  • sanoid
  • vagrant
  • virt-manager
  • virt-manager-qt
  • virt-manager.dist
  • virt-top
  • virt-viewer
  • zfs (zfs_unstable)
  • zfs.dev (zfs_unstable.dev)
  • zfstools
  • zpool-auto-expand-partitions
  • zxfer

@adamcstephens adamcstephens merged commit 1602c0d into NixOS:master Aug 7, 2024
31 of 33 checks passed
@amarshall amarshall deleted the zfs-update branch August 7, 2024 13:21
Ma27 added a commit to Ma27/nixpkgs that referenced this pull request Aug 14, 2024
Maintainers decided to not backport NixOS#332848, so no 6.10 compatibility
for ZFS 2.2 on 24.05.
@amarshall amarshall added the backport release-24.05 Backport PR automatically label Sep 5, 2024
Copy link
Contributor

github-actions bot commented Sep 5, 2024

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

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-332848-to-release-24.05 origin/release-24.05
cd .worktree/backport-332848-to-release-24.05
git switch --create backport-332848-to-release-24.05
git cherry-pick -x 8d0db928289e0d3fd8fbefad0a15b3e6c734fb2e fde7c3afb37e7a9d4be39e112b4b8f0bd6f75352

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants