diff --git a/pkgs/by-name/ca/catch2_3/package.nix b/pkgs/by-name/ca/catch2_3/package.nix index 7bc475e22559..58cb11c64144 100644 --- a/pkgs/by-name/ca/catch2_3/package.nix +++ b/pkgs/by-name/ca/catch2_3/package.nix @@ -4,17 +4,18 @@ fetchFromGitHub, cmake, python3, + spdlog, }: 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 = '' @@ -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"; 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 ];