From e28c1469642d1b4219fde849de6df2712bc3f181 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 28 Dec 2024 22:25:33 +0000 Subject: [PATCH] foundationdb: unpin Boost --- pkgs/servers/foundationdb/cmake.nix | 5 +++++ pkgs/servers/foundationdb/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 42a9b38ea781..56470052a64d 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -87,6 +87,11 @@ let # Use our doctest package substituteInPlace bindings/c/test/unit/third_party/CMakeLists.txt \ --replace-fail '/opt/doctest_proj_2.4.8' '${doctest}/include' + + # Upstream upgraded to Boost 1.86 with no code changes; see: + # + substituteInPlace cmake/CompileBoost.cmake \ + --replace-fail 'find_package(Boost 1.78.0 EXACT ' 'find_package(Boost ' ''; # the install phase for cmake is pretty wonky right now since it's not designed to diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 4962b521f372..35937a8302af 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -11,7 +11,7 @@ openjdk8, mono, openssl, - boost178, + boost, pkg-config, msgpack-cxx, toml11, @@ -26,7 +26,7 @@ in foundationdb73 = cmakeBuild { version = "7.3.42"; hash = "sha256-jQcm+HLai5da2pZZ7iLdN6fpQZxf5+/kkfv9OSXQ57c="; - boost = boost178; + inherit boost; ssl = openssl; patches = [