From 8c304370ceacccd58a9c96e5a9a3fe8e0dd831ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Aug 2024 06:44:39 +0000 Subject: [PATCH 1/2] ioc-scan: 1.5.4 -> 2.0.0 --- pkgs/tools/security/ioc-scan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ioc-scan/default.nix b/pkgs/tools/security/ioc-scan/default.nix index e080426162a6..99cf78a8079a 100644 --- a/pkgs/tools/security/ioc-scan/default.nix +++ b/pkgs/tools/security/ioc-scan/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ioc-scan"; - version = "1.5.4"; + version = "2.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = "cisagov"; repo = "ioc-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-LQljpIlTDy1uxuwj1WyygwrB5hQ7dib1ViB+SEhRJ6Y="; + hash = "sha256-SCyCANZfi7PqexM2Kc8WJwwEEiBQxPBg0ggWsK9WB4k="; }; postPatch = '' From 032cabedbb22d21c444c2234bf6fea3da31d2672 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Aug 2024 08:58:49 +0200 Subject: [PATCH 2/2] ioc-scan: refactor --- pkgs/tools/security/ioc-scan/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/ioc-scan/default.nix b/pkgs/tools/security/ioc-scan/default.nix index 99cf78a8079a..805aee0230bb 100644 --- a/pkgs/tools/security/ioc-scan/default.nix +++ b/pkgs/tools/security/ioc-scan/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "ioc-scan"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "cisagov"; @@ -17,21 +17,19 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pytest.ini \ - --replace " --cov" "" + --replace-fail " --cov" "" ''; - propagatedBuildInputs = with python3.pkgs; [ - docopt - ]; + build-system = with python3.pkgs; [ setuptools ]; + + propagatedBuildInputs = with python3.pkgs; [ docopt]; nativeCheckInputs = with python3.pkgs; [ pyfakefs pytestCheckHook ]; - pythonImportsCheck = [ - "ioc_scan" - ]; + pythonImportsCheck = [ "ioc_scan" ]; meta = with lib; { description = "Tool to search a filesystem for indicators of compromise (IoC)";