[Backport release-24.11] ceph: 19.2.0 -> 19.2.1 #388087
Conversation
github-actions
bot
added
10.rebuild-darwin: 0
|
The real machine works just fine, and the 4 NixOS Tests are passing too (again, only x86_64-linux tested). |
benaryorg
force-pushed
the
backport-381075-to-release-24.11
branch
from
a3453fa to
60961a9
Compare
|
Rebase to make sure the checks are still fine and all that.… git fetch origin master pull/388087/head
git diff origin/master origin/pull/388087/head -- pkgs/tools/filesystems/ceph/It's pretty much everything except for c314e80 (as per last commit message), plus it's been running on my machine for a while. @nh2: whenever you have some time to spare, I'd appreciate the review ^^ |
The proper way to do it, is to cherry-pick each commit from master with This is also documented: https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#manually-backporting-changes Makes it a lot easier to review. (needs a rebase anyway, to trigger eval once more) |
(cherry picked from commit da349fc)
Closes: NixOS#369777 (cherry picked from commit eef74a1)
Currently this is the only package keeping Boost 1.82 around; upstream install 1.85 on the development branch and have merged patches for 1.86 compatibility, so let’s unpin it and deal with pinning again if we run into compilation errors in the future. All but one patch has already been merged upstream. (cherry picked from commit 047670d)
(cherry picked from commit 6b77b73)
We surely don't need docs in the overridden pyopenssl. https://hydra.nixos.org/build/287563868/nixlog/1/tail (cherry picked from commit 7e259ce)
Honestly, I don't know. All so ugly. Hopefully we don't need much of pyopenssl here anyway. https://hydra.nixos.org/build/290186587/nixlog/7/tail (cherry picked from commit 61da3c0)
Had to downgrade the used boost186 -> boost183, see added comment. (cherry picked from commit f2d3155)
Otherwise changes will keep causing merge conflicts. Given that the master branch was already tested on 24.11 in the original PR it should be fine. Includes partials from: - cace2b6 - 5aba992 Explicitly not picked was c314e80 since the *trustme* version is still present in 24.11. Signed-off-by: benaryorg <binary@benary.org>
benaryorg
force-pushed
the
backport-381075-to-release-24.11
branch
from
60961a9 to
df76780
Compare
Aight, thank you very much, should be fine now, I hope, given I used interactive rebase with rewording to add the line myself, though I did diff every single commit to make sure nothing but the added line in the commit message as well as potentially line numbers changed.
Done. |
|
Manual backport of #381075 including several cherry-picks and one commit with partial picks to keep the code in sync with master, which, looking at the current date is probably not going to be useful to anyone as a new NixOS version is more likely to hit before another Ceph version.
Either way, this is the exact version that I have already tested in the original PR on 24.11, minus the trustme version, since that one is the current one in 24.11.
This is currently a draft, just so that nobody else starts working on the same backport while my tower is still compiling Ceph (and the linux kernel that's not built by upstream hydra, but which is required to run the tests on this commit).I'll undraft it as soon as those tests are done.