From b00811b2b0c6f6d5e5555e745402d143b5ede6c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 10:33:20 +0200 Subject: [PATCH 1/2] python312Packages.pysigma-backend-opensearch: 1.0.1 -> 1.0.2 Diff: https://github.com/SigmaHQ/pySigma-backend-opensearch/compare/refs/tags/v1.0.1...v1.0.2 Changelog: https://github.com/SigmaHQ/pySigma-backend-opensearch/releases/tag/v1.0.2 --- .../python-modules/pysigma-backend-opensearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix index 666816669929..a1df7e094695 100644 --- a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pysigma-backend-opensearch"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-opensearch"; rev = "refs/tags/v${version}"; - hash = "sha256-g3kGaNq07yMu3mnRDeZB3Ck8wwzK3HcOIzkl36cNOs8="; + hash = "sha256-VEMt9CKbhPRj1182WcLOqF9JOEzorrz9Yyqp0+FAA88="; }; postPatch = '' From 6d4eb100e28365d5f30b2084b9ee13dcd4c87066 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 11:06:39 +0200 Subject: [PATCH 2/2] python312Packages.pysigma-backend-opensearch: refactor --- .../pysigma-backend-opensearch/default.nix | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix index a1df7e094695..5716a6ebd79e 100644 --- a/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, poetry-core -, pysigma -, pysigma-backend-elasticsearch -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, requests +{ + lib, + buildPythonPackage, + fetchFromGitHub, + poetry-core, + pysigma, + pysigma-backend-elasticsearch, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + requests, }: buildPythonPackage rec { @@ -29,16 +30,13 @@ buildPythonPackage rec { --replace-fail " --cov=sigma --cov-report term --cov-report xml:cov.xml" "" ''; - pythonRelaxDeps = [ - "pysigma" - ]; + pythonRelaxDeps = [ "pysigma" ]; - nativeBuildInputs = [ - poetry-core - pythonRelaxDepsHook - ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ pysigma pysigma-backend-elasticsearch ]; @@ -48,9 +46,7 @@ buildPythonPackage rec { requests ]; - pythonImportsCheck = [ - "sigma.backends.opensearch" - ]; + pythonImportsCheck = [ "sigma.backends.opensearch" ]; disabledTests = [ # Tests requires network access