Skip to content

zfs_2_2: 2.2.7 -> 2.2.8#416236

Merged
adamcstephens merged 4 commits intoNixOS:masterfrom
adamcstephens:push-pmnlmlwqwqlo
Jun 14, 2025
Merged

zfs_2_2: 2.2.7 -> 2.2.8#416236
adamcstephens merged 4 commits intoNixOS:masterfrom
adamcstephens:push-pmnlmlwqwqlo

Conversation

@adamcstephens
Copy link
Contributor

@adamcstephens adamcstephens commented Jun 12, 2025

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:
  • 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/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (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, pkgs/README.md, maintainers/README.md and other contributing documentation in corresponding paths.

Add a 👍 reaction to pull requests you find important.

@adamcstephens adamcstephens requested a review from amarshall June 12, 2025 19:53
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. labels Jun 12, 2025
Copy link
Member

@amarshall amarshall left a comment

Choose a reason for hiding this comment

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

Successfully built and ran tests on x86_64-linux

"--version-regex=^zfs-(${lib.versions.major version}\\.${lib.versions.minor version}\\.[0-9]+)"
"--override-filename=pkgs/os-specific/linux/zfs/${lib.versions.major version}_${lib.versions.minor version}.nix"
];
};
Copy link
Member

Choose a reason for hiding this comment

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

❤️

// lib.optionalAttrs (kernelModuleAttribute != "zfs_unstable") {
updateScript = nix-update-script {
extraArgs = [
"--version-regex=^zfs-(${lib.versions.major version}\\.${lib.versions.minor version}\\.[0-9]+)"
Copy link
Member

@amarshall amarshall Jun 13, 2025

Choose a reason for hiding this comment

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

ZFS often has a x.y.99 tag that is mutable and not an actual release—can we skip that somehow? Something not-great-but-probably-fine like [0-8]?[0-9] perhaps? But I think that nix-update actually only uses GitHub releases, not tags, so it doesn’t matter.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think it can/does use tags as well. Looking through the previous tags, I'm not sure if this will be a problem in practice. Upstream seems to tag x.x.99 during the RC cycle, for whatever reason, and since this logic is pinned to only stable releases and matching versions, I don't suspect problems. I suggest we merge as-is, and if the bot messes up a PR we can address then. Thoughts?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Also as a singular data point, I used this updater to do the update, and it did not pick up the older 2.2.99. I think nix-update only fetches a page or two of releases/tags, and favors newest by time anyway.

Copy link
Member

Choose a reason for hiding this comment

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

Yea I think it should be fine, bringing it up to at least discuss it and validate 🙂

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jun 13, 2025
@amarshall amarshall added 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Jun 14, 2025
@adamcstephens adamcstephens merged commit 97e55e7 into NixOS:master Jun 14, 2025
20 of 21 checks passed
@adamcstephens adamcstephens deleted the push-pmnlmlwqwqlo branch June 14, 2025 03:02
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jun 14, 2025

Successfully created backport PR for release-25.05:

@github-actions github-actions bot added the 8.has: port to stable This PR already has a backport to the stable release. label Jun 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants