From 800d264bed4ea94235d0de1e205768fe15fb83f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 3 Sep 2025 14:43:22 -0700
Subject: [PATCH 1/3] catch2_3: 3.9.1 -> 3.10.0

Diff: https://github.com/catchorg/Catch2/compare/v3.9.1...v3.10.0

Changelog: https://github.com/catchorg/Catch2/blob/v3.10.0/docs/release-notes.md
---
 pkgs/by-name/ca/catch2_3/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ca/catch2_3/package.nix b/pkgs/by-name/ca/catch2_3/package.nix
index 7bc475e22559..9723df51be9a 100644
--- a/pkgs/by-name/ca/catch2_3/package.nix
+++ b/pkgs/by-name/ca/catch2_3/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "catch2";
-  version = "3.9.1";
+  version = "3.10.0";
 
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
     tag = "v${version}";
-    hash = "sha256-mkNdjbnSf8bprZ9QMYTlfMM4KBPH0v7njWzqUF/jk84=";
+    hash = "sha256-eeqqzHMeXLRiXzbY+ay8gJ/YDuxDj3f6+d6eXA1uZHE=";
   };
 
   postPatch = ''

From 7c2b1111657f951ce551fd69473bd9c3d9ad0682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 4 Sep 2025 14:08:07 -0700
Subject: [PATCH 2/3] catch2_3: add spdlog to passthru.tests

see https://github.com/NixOS/nixpkgs/pull/435366#issuecomment-3255581683
---
 pkgs/by-name/ca/catch2_3/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ca/catch2_3/package.nix b/pkgs/by-name/ca/catch2_3/package.nix
index 9723df51be9a..58cb11c64144 100644
--- a/pkgs/by-name/ca/catch2_3/package.nix
+++ b/pkgs/by-name/ca/catch2_3/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   cmake,
   python3,
+  spdlog,
 }:
 
 stdenv.mkDerivation rec {
@@ -55,6 +56,10 @@ stdenv.mkDerivation rec {
     python3
   ];
 
+  passthru.tests = {
+    inherit spdlog;
+  };
+
   meta = {
     description = "Modern, C++-native, test framework for unit-tests";
     homepage = "https://github.com/catchorg/Catch2";

From 5ec404e57d622232fb6764a757965bd7d776d074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 4 Sep 2025 14:58:50 -0700
Subject: [PATCH 3/3] spdlog: fix build with Catch2 3.9.0

---
 pkgs/by-name/sp/spdlog/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/sp/spdlog/package.nix b/pkgs/by-name/sp/spdlog/package.nix
index 37e08a8dc5a2..fe23aa839f5f 100644
--- a/pkgs/by-name/sp/spdlog/package.nix
+++ b/pkgs/by-name/sp/spdlog/package.nix
@@ -24,6 +24,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-9RhB4GdFjZbCIfMOWWriLAUf9DE/i/+FTXczr0pD0Vg=";
   };
 
+  postPatch = ''
+    # https://github.com/gabime/spdlog/pull/3451
+    substituteInPlace tests/CMakeLists.txt \
+      --replace-fail 'COMMAND ''${test_target})' 'COMMAND ''${test_target} --order decl)'
+  '';
+
   nativeBuildInputs = [ cmake ];
   # Required to build tests, even if they aren't executed
   buildInputs = [ catch2_3 ];