Unverified Commit 95f08484 authored by Niklas Hambüchen's avatar Niklas Hambüchen Committed by GitHub
Browse files

Merge pull request #334275 from nh2/ceph-18.2.4-fixes-1 

ceph: Add patches for 2 runtime crashes
parents 8f8f0c05 e0751fa3

pkgs/tools/filesystems/ceph/default.nix

+24 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, fetchurl

, fetchFromGitHub

, fetchPypi

, fetchpatch



# Build time

, cmake
@@ -319,6 +320,29 @@ in rec { 
    pname = "ceph";

    inherit src version;



    patches = [

      # Fixes mgr not being able to import `packaging` due to autotools >= 70.

      # Remove once https://github.com/ceph/ceph/pull/58624 is merged, see

      # https://github.com/NixOS/nixpkgs/pull/330226#issuecomment-2268421031

      (fetchpatch {

        url = "https://github.com/ceph/ceph/commit/8da2d857fa8fdfedd7aad0ca90e1780a3ed085c9.patch";

        name = "ceph-mgr-python-fix-packaging-import.patch";

        hash = "sha256-3Yl1X6UfTf0XCXJxgRnM/Js9sz8tS+hsqViY6gDExoI=";

      })



      # Fixes cryptesetup version parsing regex, see

      # * https://github.com/NixOS/nixpkgs/issues/334227

      # * https://www.mail-archive.com/ceph-users@ceph.io/msg26309.html

      # * https://github.com/ceph/ceph/pull/58997

      # Remove once we're on the next version of Ceph 18, when this should be in:

      # https://github.com/ceph/ceph/pull/58997

      (fetchpatch {

        url = "https://github.com/ceph/ceph/commit/6ae874902b63652fa199563b6e7950cd75151304.patch";

        name = "ceph-reef-ceph-volume-fix-set_dmcrypt_no_workqueue.patch";

        hash = "sha256-r+7hcCz2WF/rJfgKwTatKY9unJlE8Uw3fmOyaY5jVH0=";

      })

    ];



    postPatch = ''

      substituteInPlace cmake/modules/Finduring.cmake \

        --replace-fail "liburing.a liburing" "uring"