Unverified Commit 37354026 authored by Yohann Boniface's avatar Yohann Boniface Committed by GitHub
Browse files

crow: 1.2 -> 1.2.1.2 (#444521)

parents 110ca3c5 94df0fd5
Loading
Loading
Loading
Loading
+22 −0
Original line number Diff line number Diff line
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -5,18 +5,9 @@
 set(CMAKE_POLICY_WARNING_CMP0126 new)
 
 include(${CMAKE_SOURCE_DIR}/cmake/compiler_options.cmake)
-include(${CMAKE_SOURCE_DIR}/cmake/CPM.cmake)
 
+find_package(Catch2 REQUIRED)
 
-CPMAddPackage(Catch2
-  VERSION 3.7.0
-  GITHUB_REPOSITORY catchorg/Catch2
-  OPTIONS
-  "CATCH_INSTALL_DOCS Off"
-  "CATCH_INSTALL_EXTRAS Off"
-  "CATCH_ENABLE_REPRODUCIBLE_BUILD Off"
-)
-  
 enable_testing()
 
 set(TEST_SRCS
+16 −7
Original line number Diff line number Diff line
@@ -3,26 +3,29 @@
  stdenv,
  fetchFromGitHub,
  cmake,
  catch2_3,
  asio,
  python3,
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "crow";
  version = "1.2";
  version = "1.2.1.2";

  src = fetchFromGitHub {
    owner = "crowcpp";
    repo = "crow";
    rev = "v${finalAttrs.version}";
    sha256 = "sha256-fokj+KiS6frPVOoOvETxW3ue95kCcYhdhOlN3efzBd4=";
    owner = "CrowCpp";
    repo = "Crow";
    tag = "v${finalAttrs.version}";
    hash = "sha256-iQ2owNry4LOmMxyO5L7O7XZB5vwUf+ZuZL76hZ6FThk=";
  };

  patches = [
    ./cpm.patch
  ];

  propagatedBuildInputs = [ asio ];
  nativeBuildInputs = [
    asio
    cmake
    python3
  ];

  cmakeFlags = [
@@ -30,6 +33,12 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  doCheck = true;
  nativeCheckInputs = [
    python3
  ];
  checkInputs = [
    catch2_3
  ];

  meta = {
    description = "Fast and Easy to use microframework for the web";