Unverified Commit efb74057 authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #183986 from r-ryantm/auto-update/catch2

catch2_3: 3.0.1 -> 3.1.0
parents ea414410 8a441125
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -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 = [
@@ -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;