From eeff2e3d9b15cf525690c901e7f3de73c68b3468 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Tue, 29 Oct 2024 06:11:23 -0400 Subject: [PATCH] ceph: patch to pick up upstream arrow 18 s3select fix --- pkgs/tools/filesystems/ceph/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 25075f612df8..004d0bbca94b 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -4,7 +4,7 @@ , fetchurl , fetchFromGitHub , fetchPypi -, fetchpatch +, fetchpatch2 # Build time , autoconf @@ -314,6 +314,16 @@ in rec { pname = "ceph"; inherit src version; + patches = [ + (fetchpatch2 { + name = "ceph-s3select-arrow-18-compat.patch"; + url = "https://github.com/ceph/s3select/commit/f333ec82e6e8a3f7eb9ba1041d1442b2c7cd0f05.patch"; + hash = "sha256-21fi5tMIs/JmuhwPYMWtampv/aqAe+EoPAXZLJlOvgo="; + stripLen = 1; + extraPrefix = "src/s3select/"; + }) + ]; + nativeBuildInputs = [ autoconf # `autoreconf` is called, e.g. for `qatlib_ext` automake # `aclocal` is called, e.g. for `qatlib_ext`