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.

Sign up for GitHub

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

Jump to bottom

zfs: remove recommendations to use zfs_unstable, update deprecated --replace #352386

Merged
merged 3 commits into from
Nov 2, 2024
Merged

zfs: remove recommendations to use zfs_unstable, update deprecated --replace #352386

merged 3 commits into from
Nov 2, 2024

Conversation

amarshall
Copy link
Member

@amarshall amarshall commented Oct 30, 2024 •
edited by adamcstephens
Loading

See individual commits. I’ve also updated the version guidance in the wiki.

Closes #352054

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/)
  • 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.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Oct 30, 2024
@amarshall amarshall changed the title zfs_unstable: 2.2.6 -> 2.3.0-rc2, remove recommendations to use zfs_unstable zfs_unstable: 2.2.6 -> 2.3.0-rc2, remove recommendations to use zfs_unstable, update deprecated --replace Oct 30, 2024
@nix-owners nix-owners bot requested a review from RaitoBezarius October 30, 2024 14:19
This was referenced Oct 30, 2024
Closed
Open
@surfaceflinger
Copy link
Member

surfaceflinger commented Oct 30, 2024 •
edited
Loading

and yet again before someone merges this, let's wait for this to be resolved in the next tag openzfs/zfs#16631
should be fixed by openzfs/zfs#16678

@amarshall
Copy link
Member Author

amarshall commented Oct 30, 2024 •
edited
Loading

I think it’s fine to wait (I don’t use zfs_unstable, so doesn’t matter to me anyway), but I want to point out that if one is using zfs_unstable, that always comes with risk of such bugs existing but being unknown to either us or upstream. I’ll mark this draft for now while we discuss (though otherwise this PR is “ready” and review on other aspects is welcome).

@amarshall amarshall marked this pull request as draft October 30, 2024 15:11
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 1, 2024
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Nov 1, 2024 •
edited
Loading

I’ve also updated the version guidance in the wiki.

That's the old wiki, please update the new one at https://wiki.nixos.org.

@amarshall
Copy link
Member Author

@SuperSandro2000 Thanks, Mic92 also pointed that out via separate means. I always get confused which is which—hopefully this will finally get it in my head. I updated there as well, and made some other update in addition to that one as well.

@amarshall
zfs: update usage of deprecated --replace
2491be0 
- In some cases, move into a conditional as the substitution is only
  needed on some version
- One use of `--replace-warn` since it is looking in a set of files
  where the exact files that might contain it may change over time, but
  we want to cover all of them
@amarshall
zfs: remove recommendations to use unstable
9ce8810 
`pkgs.zfs_unstable` is pre-release software and may very well have
critical bugs that make it unsuitable for general use. As such, we
should not recommend it as a general solution to the problem of "my
Kernel is too new for stable ZFS".
@amarshall
zfs_unstable: expand on unstable nature in long description
b5e959d
@amarshall
Copy link
Member Author

zfs_unstable update already happened in #352111, so this PR just has the doc and cleanup changes and is now un-draft.

@amarshall amarshall marked this pull request as ready for review November 1, 2024 22:52
@adamcstephens
Copy link
Contributor

@ofborg build zfs_2_1.passthru.tests zfs_2_2.passthru.tests zfs_unstable.passthru.tests

@amarshall amarshall changed the title zfs_unstable: 2.2.6 -> 2.3.0-rc2, remove recommendations to use zfs_unstable, update deprecated --replace zfs: remove recommendations to use zfs_unstable, update deprecated --replace Nov 1, 2024
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 2, 2024
@adamcstephens adamcstephens merged commit 7fba2cb into NixOS:master Nov 2, 2024
38 of 40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

@adamcstephens adamcstephens Awaiting requested review from adamcstephens

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update request: zfs_unstable 2.2.6 → zfs-2.3-release / zfs-2.3.0-rc2
5 participants
@amarshall @surfaceflinger @SuperSandro2000 @adamcstephens @wegank