diff --git a/pkgs/by-name/ca/catch2_3/clang-20-disable-broken-test.patch b/pkgs/by-name/ca/catch2_3/clang-20-disable-broken-test.patch deleted file mode 100644 index 372243455aed..000000000000 --- a/pkgs/by-name/ca/catch2_3/clang-20-disable-broken-test.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/tests/SelfTest/UsageTests/Misc.tests.cpp b/tests/SelfTest/UsageTests/Misc.tests.cpp -index 3697f0695c..8c10aace7b 100644 ---- a/tests/SelfTest/UsageTests/Misc.tests.cpp -+++ b/tests/SelfTest/UsageTests/Misc.tests.cpp -@@ -384,10 +384,6 @@ - REQUIRE(x.size() > 0); - } - --TEMPLATE_PRODUCT_TEST_CASE("Product with differing arities", "[template][product]", std::tuple, (int, (int, double), (int, double, float))) { -- REQUIRE(std::tuple_size::value >= 1); --} -- - using MyTypes = std::tuple; - TEMPLATE_LIST_TEST_CASE("Template test case with test types specified inside std::tuple", "[template][list]", MyTypes) - { diff --git a/pkgs/by-name/ca/catch2_3/package.nix b/pkgs/by-name/ca/catch2_3/package.nix index 381fead86e88..1776477cbf56 100644 --- a/pkgs/by-name/ca/catch2_3/package.nix +++ b/pkgs/by-name/ca/catch2_3/package.nix @@ -9,21 +9,15 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "3.15.3"; + version = "3.16.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; tag = "v${version}"; - hash = "sha256-ZuH3tUWNklq0bKp0Yu9w3L5FNsQwUxe6lyGBv4M6U1E="; + hash = "sha256-vvPZTQzLNGIcdDbuo0w6sQvxzLdKFCl2LNwcHu0d5I8="; }; - patches = lib.optionals stdenv.cc.isClang [ - # This test fails to compile with Clang 20 - # See: https://github.com/catchorg/Catch2/issues/2991 - ./clang-20-disable-broken-test.patch - ]; - postPatch = '' substituteInPlace CMake/*.pc.in \ --replace-fail "\''${prefix}/" ""