From c4db34a6b56e3f57fd990ba1c1b90fc33bb2769a Mon Sep 17 00:00:00 2001 From: fliiiix Date: Thu, 25 Jun 2026 10:53:49 +0200 Subject: [PATCH] crow: 1.3.0.0 -> 1.3.2 --- pkgs/by-name/cr/crow/cpm.patch | 36 +++++++++++++++++++++++--------- pkgs/by-name/cr/crow/package.nix | 4 ++-- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/cr/crow/cpm.patch b/pkgs/by-name/cr/crow/cpm.patch index d5a6b5b8ce6f..6a4a79cf2483 100644 --- a/pkgs/by-name/cr/crow/cpm.patch +++ b/pkgs/by-name/cr/crow/cpm.patch @@ -1,17 +1,30 @@ +From 0cfacb99db5940dabc385e7bc4534dfefa60fcfd Mon Sep 17 00:00:00 2001 +From: fliiiix +Date: Thu, 25 Jun 2026 10:46:35 +0200 +Subject: [PATCH] cpm + +--- + CMakeLists.txt | 4 ---- + tests/CMakeLists.txt | 11 +---------- + 2 files changed, 1 insertion(+), 14 deletions(-) + diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7dbc2c3..cfdd98d 100644 +index 51fade9b4..1b93bffd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -11,7 +11,6 @@ project(Crow +@@ -60,10 +60,6 @@ option(CROW_ENABLE_SSL "Enable Crow's SSL feature for supporting https" OFF) + option(CROW_ENABLE_COMPRESSION "Enable Crow's Compression feature for supporting compressed http content" OFF) + option(CROW_ENABLE_TSAN "Enable ThreadSanitizer" OFF) - set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - --include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPM.cmake) - - # Make sure Findasio.cmake module is found - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +-if(CROW_GENERATE_SBOM OR CROW_BUILD_TESTS) +- include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPM.cmake) +-endif () +- + if(CROW_GENERATE_SBOM) + CPMAddPackage( + NAME cmake-sbom diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 67c458c..2873530 100644 +index 80f6dd364..e01adeb2f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -5,18 +5,9 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 new) @@ -23,7 +36,7 @@ index 67c458c..2873530 100644 +find_package(Catch2 REQUIRED) -CPMAddPackage(Catch2 -- VERSION 3.10.0 +- VERSION 3.12.0 - GITHUB_REPOSITORY catchorg/Catch2 - OPTIONS - "CATCH_INSTALL_DOCS Off" @@ -34,3 +47,6 @@ index 67c458c..2873530 100644 enable_testing() # list the test sources +-- +2.43.0 + diff --git a/pkgs/by-name/cr/crow/package.nix b/pkgs/by-name/cr/crow/package.nix index 65ed605821db..ce2b95c02aad 100644 --- a/pkgs/by-name/cr/crow/package.nix +++ b/pkgs/by-name/cr/crow/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "crow"; - version = "1.3.0.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "CrowCpp"; repo = "Crow"; tag = "v${finalAttrs.version}"; - hash = "sha256-QLYQ0RouqDDvhnBF79O/9M7IwlF0eQ3HTqR6bXWm574="; + hash = "sha256-MN2x1hgJ9TziZFPSZn6RuAEfl4mZv3ijU9LqQJkw6UM="; }; patches = [