From 94df0fd53e77dcd75d1bce8ac7869966e40b6187 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 20 Sep 2025 11:42:05 +0800 Subject: [PATCH] crow: 1.2 -> 1.2.1.2 --- pkgs/by-name/cr/crow/cpm.patch | 22 ++++++++++++++++++++++ pkgs/by-name/cr/crow/package.nix | 23 ++++++++++++++++------- 2 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 pkgs/by-name/cr/crow/cpm.patch diff --git a/pkgs/by-name/cr/crow/cpm.patch b/pkgs/by-name/cr/crow/cpm.patch new file mode 100644 index 000000000000..20122fb3cc34 --- /dev/null +++ b/pkgs/by-name/cr/crow/cpm.patch @@ -0,0 +1,22 @@ +--- 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 diff --git a/pkgs/by-name/cr/crow/package.nix b/pkgs/by-name/cr/crow/package.nix index 4eeb4a79a7a3..ec2898d65c10 100644 --- a/pkgs/by-name/cr/crow/package.nix +++ b/pkgs/by-name/cr/crow/package.nix @@ -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";