From 86afd332e9be3280436d09d170d56fdc6ebf1f19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 04:20:41 +0000 Subject: [PATCH 1/3] quark-engine: 24.4.1 -> 24.5.1 --- pkgs/tools/security/quark-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index 43e9413d125c..0ec111917f91 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "24.4.1"; + version = "24.5.1"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-cWO/avMz9nT9yo10b1ugC0C8NsEp2jAlcR0/+86gFKc="; + sha256 = "sha256-W1UeTiyyYZzxu3XQ/6VkTvEyqPWl1Du6QutuoPhaSfs="; }; nativeBuildInputs = with python3.pkgs; [ From fa92d21f963c0525e9b6261632033ad49ab913f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:27:22 +0200 Subject: [PATCH 2/3] quark-engine: refactor --- pkgs/tools/security/quark-engine/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index 0ec111917f91..3734e938fd2c 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -10,18 +10,21 @@ python3.pkgs.buildPythonApplication rec { pyproject = true; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "quark-engine"; + repo = "quark-engine"; rev = "refs/tags/v${version}"; - sha256 = "sha256-W1UeTiyyYZzxu3XQ/6VkTvEyqPWl1Du6QutuoPhaSfs="; + hash = "sha256-W1UeTiyyYZzxu3XQ/6VkTvEyqPWl1Du6QutuoPhaSfs="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools + ]; + + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ androguard click colorama From 71a0a41d5d6d22b2c2f98f4f6a5e5e060dc84aec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 09:27:55 +0200 Subject: [PATCH 3/3] quark-engine: format with nixfmt --- pkgs/tools/security/quark-engine/default.nix | 25 +++++++------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index 3734e938fd2c..58236cc8b30a 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -1,7 +1,8 @@ -{ lib -, fetchFromGitHub -, gitMinimal -, python3 +{ + lib, + fetchFromGitHub, + gitMinimal, + python3, }: python3.pkgs.buildPythonApplication rec { @@ -16,13 +17,9 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-W1UeTiyyYZzxu3XQ/6VkTvEyqPWl1Du6QutuoPhaSfs="; }; - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ androguard @@ -40,16 +37,12 @@ python3.pkgs.buildPythonApplication rec { tqdm ]; - pythonRelaxDeps = [ - "r2pipe" - ]; + pythonRelaxDeps = [ "r2pipe" ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ - "quark" - ]; + pythonImportsCheck = [ "quark" ]; meta = with lib; { description = "Android malware (analysis and scoring) system";