From bf3c22db390d65825600556752c825086d2519dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Oct 2024 21:31:07 -0700 Subject: [PATCH] taskflow: 3.7.0 -> 3.8.0 Diff: https://github.com/taskflow/taskflow/compare/v3.7.0...v3.8.0 Changelog: https://taskflow.github.io/taskflow/release-3-8-0.html --- pkgs/development/libraries/taskflow/default.nix | 4 ++-- .../development/libraries/taskflow/unvendor-doctest.patch | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/development/libraries/taskflow/default.nix index cdb5303f1a11..f76fd5dae410 100644 --- a/pkgs/development/libraries/taskflow/default.nix +++ b/pkgs/development/libraries/taskflow/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "taskflow"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; rev = "v${version}"; - hash = "sha256-q2IYhG84hPIZhuogWf6ojDG9S9ZyuJz9s14kQyIc6t0="; + hash = "sha256-gim1QQKtzMXz8BmNg5YeN4mcveiid5MrS8IrTaTtZ1Y="; }; patches = [ diff --git a/pkgs/development/libraries/taskflow/unvendor-doctest.patch b/pkgs/development/libraries/taskflow/unvendor-doctest.patch index 85f2e1fcff98..2caea7fe4613 100644 --- a/pkgs/development/libraries/taskflow/unvendor-doctest.patch +++ b/pkgs/development/libraries/taskflow/unvendor-doctest.patch @@ -1,5 +1,5 @@ diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt -index 3397d798..8277191e 100644 +index c1fef333..eaf387ea 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -1,6 +1,6 @@ @@ -9,11 +9,11 @@ index 3397d798..8277191e 100644 +include(@doctest@/lib/cmake/doctest/doctest.cmake) list(APPEND TF_UNITTESTS - utility -@@ -24,7 +24,7 @@ list(APPEND TF_UNITTESTS + test_utility +@@ -44,7 +44,7 @@ endif() foreach(unittest IN LISTS TF_UNITTESTS) add_executable(${unittest} ${unittest}.cpp) - target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings) + target_link_libraries(${unittest} ${PROJECT_NAME} ${ATOMIC_LIBRARY} tf::default_settings) - target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) + target_include_directories(${unittest} PRIVATE @doctest@/include/doctest) doctest_discover_tests(${unittest})