diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix index a3323397ad35..7ca68e35d4d7 100644 --- a/pkgs/by-name/db/dbus-cpp/package.nix +++ b/pkgs/by-name/db/dbus-cpp/package.nix @@ -2,10 +2,9 @@ stdenv, lib, fetchFromGitLab, - fetchpatch2, gitUpdater, testers, - boost186, + boost, cmake, ctestCheckHook, dbus, @@ -21,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dbus-cpp"; - version = "5.0.5"; + version = "5.0.6"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lib-cpp/dbus-cpp"; tag = finalAttrs.version; - hash = "sha256-+QqmZsBFmYRwaAFqRyMBxVFFrjZGBDdMaW4YD/7D2gU="; + hash = "sha256-ehP+QW/tTR6tLHEiWGDbiYT9oAqlS346UaVTkJC5bSE="; }; outputs = [ @@ -37,16 +36,6 @@ stdenv.mkDerivation (finalAttrs: { "examples" ]; - patches = [ - # Provide more information when there's an issue in AsyncExecutionLoadTest.RepeatedlyInvokingAnAsyncFunctionWorks - # Remove when version > 5.0.5 - (fetchpatch2 { - name = "0001-dbus-cpp-tests-async_execution_load_test-Print-received-error-on-DBus-method-failure.name"; - url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/8390ce83153c2ae29f21afd2bf5e79e88c59e6d9.diff"; - hash = "sha256-js2nXT7eG9dcX+yoFMNRVlamQxsbJclmKTX6/5RxxM4="; - }) - ]; - postPatch = '' substituteInPlace doc/CMakeLists.txt \ --replace-fail 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}' @@ -74,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - boost186 # uses boost/asio/io_service.hpp + boost lomiri.cmake-extras dbus libxml2 @@ -101,6 +90,9 @@ stdenv.mkDerivation (finalAttrs: { enableParallelChecking = false; disabledTests = [ + # Flaky flaky flaky. Spams D-Bus with hundreds of requests, and if any is dropped, the test fails. + "async_execution_load_test" + # Possible memory corruption in Executor.TimeoutsAreHandledCorrectly # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/10 "executor_test" @@ -113,9 +105,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; - # Not bumped for 5.0.5: https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/9 - # Try again on next bump. - versionCheck = finalAttrs.version != "5.0.5"; + versionCheck = true; }; updateScript = gitUpdater { }; }; diff --git a/pkgs/desktops/lomiri/development/trust-store/default.nix b/pkgs/desktops/lomiri/development/trust-store/default.nix index f9ec48f3163a..f8f85d470b3a 100644 --- a/pkgs/desktops/lomiri/development/trust-store/default.nix +++ b/pkgs/desktops/lomiri/development/trust-store/default.nix @@ -5,8 +5,8 @@ fetchpatch, gitUpdater, testers, - # dbus-cpp not compatible with Boost 1.87 - # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/8 + # Uses boost/asio/io_service.hpp + # Waiting for https://gitlab.com/ubports/development/core/trust-store/-/merge_requests/19 to get finished & merged boost186, cmake, cmake-extras, diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix index 2fd3c1ca05b1..56370d078c1d 100644 --- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix +++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix @@ -5,9 +5,7 @@ gitUpdater, nixosTests, testers, - # dbus-cpp not compatible with Boost 1.87 - # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/8 - boost186, + boost, cmake, cmake-extras, dbus, @@ -60,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - boost186 + boost cmake-extras dbus dbus-cpp