ceph: 19.2.2 -> 19.2.3
* Removed upstream applied patches. * libnbd became a new required dependency: https://github.com/ceph/ceph/commit/5a2c11c579f9a3516c8b532f9d2a79ba2990e03e
This commit is contained in:
@@ -50,6 +50,7 @@
|
||||
kmod,
|
||||
libcap,
|
||||
libcap_ng,
|
||||
libnbd,
|
||||
libnl,
|
||||
libxml2,
|
||||
lmdb,
|
||||
@@ -360,10 +361,10 @@ let
|
||||
);
|
||||
inherit (ceph-python-env.python) sitePackages;
|
||||
|
||||
version = "19.2.2";
|
||||
version = "19.2.3";
|
||||
src = fetchurl {
|
||||
url = "https://download.ceph.com/tarballs/ceph-${version}.tar.gz";
|
||||
hash = "sha256-7FD9LJs25VzUCRIBm01Cm3ss1YLTN9YLwPZnHSMd8rs=";
|
||||
hash = "sha256-zlgp28C81SZbaFJ4yvQk4ZgYz4K/aZqtcISTO8LscSU=";
|
||||
};
|
||||
in
|
||||
rec {
|
||||
@@ -372,14 +373,6 @@ rec {
|
||||
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/";
|
||||
})
|
||||
|
||||
./boost-1.85.patch
|
||||
|
||||
(fetchpatch2 {
|
||||
@@ -393,14 +386,6 @@ 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
|
||||
|
||||
# TODO: Remove with Ceph >= 19.2.3
|
||||
(fetchpatch2 {
|
||||
name = "ceph-squid-client-disallow-unprivileged-users-to-escalate-root-privileges.patch";
|
||||
url = "https://github.com/ceph/ceph/commit/380da5049e8ea7c35f34022fba24d3e2d4db6dd8.patch?full_index=1";
|
||||
hash = "sha256-hVJ1v/n2YCJLusw+DEyK12MG73sJ/ccwbSc+2pLRxvw=";
|
||||
})
|
||||
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -441,6 +426,7 @@ rec {
|
||||
gtest
|
||||
icu
|
||||
libcap
|
||||
libnbd
|
||||
libnl
|
||||
libxml2
|
||||
lmdb
|
||||
|
||||
Reference in New Issue
Block a user