diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/by-name/ta/taskflow/package.nix
similarity index 66%
rename from pkgs/development/libraries/taskflow/default.nix
rename to pkgs/by-name/ta/taskflow/package.nix
index cdb5303f1a11..1a110fe0885a 100644
--- a/pkgs/development/libraries/taskflow/default.nix
+++ b/pkgs/by-name/ta/taskflow/package.nix
@@ -1,25 +1,25 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, substituteAll
-, doctest
-, cmake
+{
+  cmake,
+  doctest,
+  fetchFromGitHub,
+  lib,
+  replaceVars,
+  stdenv,
 }:
 
 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 = [
-    (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 ];
diff --git a/pkgs/development/libraries/taskflow/unvendor-doctest.patch b/pkgs/by-name/ta/taskflow/unvendor-doctest.patch
similarity index 77%
rename from pkgs/development/libraries/taskflow/unvendor-doctest.patch
rename to pkgs/by-name/ta/taskflow/unvendor-doctest.patch
index 85f2e1fcff98..2caea7fe4613 100644
--- a/pkgs/development/libraries/taskflow/unvendor-doctest.patch
+++ b/pkgs/by-name/ta/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})
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"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 977659829075..93aa314ef3d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23231,8 +23231,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 { };