diff --git a/pkgs/by-name/do/doctest/package.nix b/pkgs/by-name/do/doctest/package.nix
index 793a4af00f58..590252b0fdad 100644
--- a/pkgs/by-name/do/doctest/package.nix
+++ b/pkgs/by-name/do/doctest/package.nix
@@ -8,21 +8,22 @@
 
 stdenv.mkDerivation rec {
   pname = "doctest";
-  version = "2.4.11";
+  version = "2.4.12";
 
   src = fetchFromGitHub {
     owner = "doctest";
     repo = "doctest";
-    rev = "v${version}";
-    sha256 = "sha256-hotO6QVpPn8unYTaQHFgi40A3oLUd++I3aTe293e4Aw=";
+    tag = "v${version}";
+    hash = "sha256-Fxs1EWydhqN9whx+Cn4fnZ4fhCEQvFgL5e9TUiXlnq8=";
   };
 
   patches = [
-    # Suppress unsafe buffer usage warnings with clang 16, which are treated as errors due to `-Werror`.
-    # https://github.com//doctest/doctest/pull/768
+    # Fix the build with Clang.
     (fetchpatch {
-      url = "https://github.com/doctest/doctest/commit/9336c9bd86e3fc2e0c36456cad8be3b4e8829a22.patch";
-      hash = "sha256-ZFCVk5qvgfixRm7ZFr7hyNCSEvrT6nB01G/CBshq53o=";
+      name = "doctest-disable-warnings.patch";
+      url = "https://github.com/doctest/doctest/commit/c8d9ed2398d45aa5425d913bd930f580560df30d.patch";
+      excludes = [ ".github/workflows/main.yml" ];
+      hash = "sha256-kOBy0om6MPM2vLXZjNLXiezZqVgNr/viBI7mXrOZts8=";
     })
   ];
 
@@ -30,6 +31,18 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  # Fix the build with LLVM 21 / GCC 15.
+  #
+  # See:
+  #
+  # * <https://github.com/doctest/doctest/issues/928>
+  # * <https://github.com/doctest/doctest/pull/929>
+  # * <https://github.com/doctest/doctest/issues/950>
+  env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
+    "-Wno-error=nrvo"
+    "-Wno-error=missing-noreturn"
+  ];
+
   meta = with lib; {
     homepage = "https://github.com/doctest/doctest";
     description = "Fastest feature-rich C++11/14/17/20 single-header testing framework";