From 15be66c9fba7baf92a71c288f764ad2c5a9e516d Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Thu, 27 Nov 2025 19:09:45 +0100 Subject: [PATCH 1/2] python313Packages.yaramod: fix build with cmake 4 (cherry picked from commit da9058f2a377193367a7cd5030b4e26a691f6668) --- pkgs/development/python-modules/yaramod/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index 7049bf0e6a23..e94ce5996dae 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -37,6 +37,9 @@ buildPythonPackage rec { cp -r --no-preserve=all ${nlohmann_json.src}/single_include/nlohmann/json.hpp deps/json/ cp -r --no-preserve=all ${pybind11.src} deps/pybind11/ cp -r --no-preserve=all ${gtest.src} deps/googletest/ + + substituteInPlace deps/pog/deps/fmt/fmt/CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)" ''; dontUseCmakeConfigure = true; From 556fc1418702925c8b03cf3a70ede34927069941 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Thu, 27 Nov 2025 19:36:57 +0100 Subject: [PATCH 2/2] python313Packages.yaramod: refactor (cherry picked from commit f066a321c2066834228e0903d7440626ead1f9e6) --- pkgs/development/python-modules/yaramod/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index e94ce5996dae..011155f36b67 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -64,11 +64,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "yaramod" ]; - meta = with lib; { + meta = { description = "Parsing of YARA rules into AST and building new rulesets in C++"; homepage = "https://github.com/avast/yaramod"; - changelog = "https://github.com/avast/yaramod/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ msm ]; + changelog = "https://github.com/avast/yaramod/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ msm ]; }; }