Unverified Commit 699893f7 authored by Vladimír Čunát's avatar Vladimír Čunát Committed by GitHub
Browse files

ceph: fix CMake 4.0 builds (#451118)

parents df05dcce ebb38a0c

pkgs/tools/filesystems/ceph/arrow-cpp-19.nix

+6 −0
Original line number Diff line number Diff line
@@ -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

pkgs/tools/filesystems/ceph/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -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";

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

      })

    ];



    nativeBuildInputs = [