Skip to content

ceph: fix CMake 4.0 builds #451118

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

Merged
vcunat merged 2 commits into from
Oct 18, 2025
Merged

ceph: fix CMake 4.0 builds #451118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b572449
ceph: update `arrow-cpp` with CMake 4 support
nazarewk Oct 11, 2025
ebb38a0
ceph: update `cpp_redis` with CMake 4 support
nazarewk Oct 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkgs/tools/filesystems/ceph/arrow-cpp-19.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-WTpe/eT3himlCHN/R78w1sF0HG859mE2ZN70U+9N8Ag=";
stripLen = 1;
})
(fetchpatch2 {
name = "cmake-fix.patch";
url = "https://github.com/apache/arrow/commit/48c0bbbd4a2eedcca518caeb7f7547c7988dc740.patch?full_index=1";
hash = "sha256-i/vZy/61VYP+mo1AxfoiBSjTip04vhFOh3hGjHCJy6g=";
stripLen = 1; # applying patch from within `cpp/` subdirectory
})
];

# versions are all taken from
Expand Down
6 changes: 6 additions & 0 deletions pkgs/tools/filesystems/ceph/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,12 @@ rec {
# * <https://aur.archlinux.org/cgit/aur.git/commit/?h=ceph&id=8c5cc7d8deec002f7596b6d0860859a0a718f12b>
# * <https://github.com/ceph/ceph/pull/60999>
./boost-1.86-PyModule.patch

(fetchpatch2 {
name = "ceph-cmake-4.patch";
url = "https://gitlab.alpinelinux.org/ashpool/aports/-/raw/d22b70eafe33c3daabe4eea6913c5be87d9463ad/community/ceph19/cpp_redis.patch";
Copy link
Member

@niklaskorz niklaskorz Oct 12, 2025

Choose a reason for hiding this comment

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

Fetching a patch from a foreign package repository that does nothing but replace the cmake_minimum_required parameter feels odd.

hash = "sha256-wxPIsYt25CjXhJ6kmr/MXwFD58Sl4y4W+r9jAMND+uw=";
})
];

nativeBuildInputs = [
Expand Down
Loading