From 7cf711c4e045ad5dbd77bc07bcd30db7807a2298 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Jul 2022 15:25:20 +0000
Subject: [PATCH 1/2] catch2_3: 3.0.1 -> 3.1.0

---
 pkgs/development/libraries/catch2/3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix
index aaf8c5d5d05..7a4d1ff52df 100644
--- a/pkgs/development/libraries/catch2/3.nix
+++ b/pkgs/development/libraries/catch2/3.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "catch2";
-  version = "3.0.1";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
     rev = "v${version}";
-    hash = "sha256-GcMkAgSfQnWs8wQeQD4ZMxJZED8V7FWBU04qMCutlPo=";
+    hash = "sha256-bp/KLTr754txVUTAauJFrsxGKgZicUEe40CZBDkxRwk=";
   };
 
   nativeBuildInputs = [

From 8a4411252e9efcf19b5bad51bdf868d7fff776a6 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 30 Jul 2022 22:44:50 +0100
Subject: [PATCH 2/2] catch2_3: skip test ApprovalTests on darwin

---
 pkgs/development/libraries/catch2/3.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/catch2/3.nix b/pkgs/development/libraries/catch2/3.nix
index 7a4d1ff52df..9c2de74bea2 100644
--- a/pkgs/development/libraries/catch2/3.nix
+++ b/pkgs/development/libraries/catch2/3.nix
@@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DCATCH_DEVELOPMENT_BUILD=ON"
     "-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}"
+  ] ++ lib.optionals (stdenv.isDarwin && doCheck) [
+    # test has a faulty path normalization technique that won't work in
+    # our darwin build environment https://github.com/catchorg/Catch2/issues/1691
+    "-DCMAKE_CTEST_ARGUMENTS=-E;ApprovalTests"
   ];
 
   doCheck = true;