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 1/4] 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}) From 866ecd3def487d5b923f1b6c61451783b92387b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Oct 2024 21:46:24 -0700 Subject: [PATCH 2/4] taskflow: modernize --- .../libraries/taskflow/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/development/libraries/taskflow/default.nix index f76fd5dae410..1a110fe0885a 100644 --- a/pkgs/development/libraries/taskflow/default.nix +++ b/pkgs/development/libraries/taskflow/default.nix @@ -1,9 +1,10 @@ -{ lib -, stdenv -, fetchFromGitHub -, substituteAll -, doctest -, cmake +{ + cmake, + doctest, + fetchFromGitHub, + lib, + replaceVars, + stdenv, }: stdenv.mkDerivation rec { @@ -18,8 +19,7 @@ stdenv.mkDerivation rec { }; patches = [ - (substituteAll { - src = ./unvendor-doctest.patch; + (replaceVars ./unvendor-doctest.patch { inherit doctest; }) ]; @@ -40,9 +40,11 @@ stdenv.mkDerivation rec { meta = { description = "General-purpose Parallel and Heterogeneous Task Programming System"; homepage = "https://taskflow.github.io/"; - changelog = let - release = lib.replaceStrings ["."] ["-"] version; - in "https://taskflow.github.io/taskflow/release-${release}.html"; + changelog = + let + release = lib.replaceStrings [ "." ] [ "-" ] version; + in + "https://taskflow.github.io/taskflow/release-${release}.html"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ dotlambda ]; From 4631e519a8d18c2ee67650c9ec2af6bcdb00cc59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Oct 2024 22:00:56 -0700 Subject: [PATCH 3/4] taskflow: move to pkgs/by-name --- .../taskflow/default.nix => by-name/ta/taskflow/package.nix} | 0 .../libraries => by-name/ta}/taskflow/unvendor-doctest.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{development/libraries/taskflow/default.nix => by-name/ta/taskflow/package.nix} (100%) rename pkgs/{development/libraries => by-name/ta}/taskflow/unvendor-doctest.patch (100%) diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/by-name/ta/taskflow/package.nix similarity index 100% rename from pkgs/development/libraries/taskflow/default.nix rename to pkgs/by-name/ta/taskflow/package.nix diff --git a/pkgs/development/libraries/taskflow/unvendor-doctest.patch b/pkgs/by-name/ta/taskflow/unvendor-doctest.patch similarity index 100% rename from pkgs/development/libraries/taskflow/unvendor-doctest.patch rename to pkgs/by-name/ta/taskflow/unvendor-doctest.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0b24c7f13ef..3e712edc4732 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23233,8 +23233,6 @@ with pkgs; tagparser = callPackage ../development/libraries/tagparser { }; - taskflow = callPackage ../development/libraries/taskflow { }; - tclap = tclap_1_2; tclap_1_2 = callPackage ../development/libraries/tclap/1.2.nix { }; From f25e1d1fb791e7ed1df05f5a3e1cd565b9c20d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 14 Oct 2024 21:59:54 -0700 Subject: [PATCH 4/4] python312Packages.rapidfuzz: support Taskflow 3.8.0 --- pkgs/development/python-modules/rapidfuzz/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 4e11201befd4..3a99b5ac5667 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch2, cmake, cython, ninja, @@ -31,6 +32,15 @@ buildPythonPackage rec { hash = "sha256-hLYidU09nCSOi42zgSh7dW83glxIjFY4C6BTmy/sf60="; }; + patches = [ + # https://github.com/rapidfuzz/RapidFuzz/pull/414 + (fetchpatch2 { + name = "support-taskflow-3.8.0.patch"; + url = "https://github.com/rapidfuzz/RapidFuzz/commit/8f0429bbd970ccc036018b87108845c384911ff7.patch"; + hash = "sha256-1wizdCkXYEMe5JWXUHCOCuDdS0z76FKimR47B3s2oVU="; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "Cython >=3.0.11, <3.1.0" "Cython"