From 519235db37ed6903c02edc48fbb864f966b667ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Aug 2022 16:41:04 +0200 Subject: [PATCH 1/8] python310Packages.karton-dashboard: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/karton-dashboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index 59e93491c7f3..8ac4f1022d81 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "karton-dashboard"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-thjAgK5EgevkFdKooljrrejwJorT6Lea9QSF0cZhxmw="; + sha256 = "sha256-XMyQ0mRF4y61hqlqdxC+He+697P1URfOXQUMnV0pT7o="; }; propagatedBuildInputs = [ From 00c76bcb34ef6481ba0cd937155a8805af9e8b80 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Aug 2022 16:41:54 +0200 Subject: [PATCH 2/8] python310Packages.karton-asciimagic: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/karton-asciimagic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-asciimagic/default.nix b/pkgs/development/python-modules/karton-asciimagic/default.nix index 6edafea1d560..3ebba4202b3b 100644 --- a/pkgs/development/python-modules/karton-asciimagic/default.nix +++ b/pkgs/development/python-modules/karton-asciimagic/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "karton-asciimagic"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "0vj4b8man81g99g4c53zyvp1gc47c2imj5ha9r4z4bf8gs3aqsv6"; + sha256 = "sha256-sY5ik9efzLBa6Fbh17Vh4q7PlwOGYjuodU9yvp/8E3k="; }; propagatedBuildInputs = [ From f720fd57d3f14fd0db085cd6453a769c32235b4f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Aug 2022 16:42:49 +0200 Subject: [PATCH 3/8] python310Packages.karton-yaramatcher: 1.1.1 -> 1.2.0 --- .../development/python-modules/karton-yaramatcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-yaramatcher/default.nix b/pkgs/development/python-modules/karton-yaramatcher/default.nix index 6183e9500059..16b4036c90cb 100644 --- a/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "karton-yaramatcher"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "0mv8v1gk6p21pw9kx6cxr76l6c5fxd3p6dk85cwfzz100h8mdvar"; + sha256 = "sha256-ulWwPXbjqQXwSRi8MFdcx7vC7P19yu66Ll8jkuTesao="; }; propagatedBuildInputs = [ From b2c965d8a0a96b98c2f2a7f11156c32c55d5156e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Aug 2022 16:43:34 +0200 Subject: [PATCH 4/8] python310Packages.karton-mwdb-reporter: 1.1.0 -> 1.2.0 --- .../python-modules/karton-mwdb-reporter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix index 0eae4b44213c..75523b67617f 100644 --- a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix +++ b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "karton-mwdb-reporter"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - hash = "sha256-2qG/8D6ZlUFJg+BB/QZ9ZMJpbsLei/7TRXd6bF40Fvg="; + hash = "sha256-QVxczXT74Xt0AtCSDm4nhIK4qtHQ6bqmVNb/CALZSE4="; }; propagatedBuildInputs = [ From 3076092b4c04ea7b8f2a6273c19c53ffb62770b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Aug 2022 16:44:14 +0200 Subject: [PATCH 5/8] python310Packages.karton-config-extractor: 2.0.2 -> 2.1.1 --- .../python-modules/karton-config-extractor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-config-extractor/default.nix b/pkgs/development/python-modules/karton-config-extractor/default.nix index ab092fc25605..673d7569463a 100644 --- a/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "karton-config-extractor"; - version = "2.0.2"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r0WMtfau5zeVDSjxy2h96INQl8bm4EP0IAcgnGPhTtk="; + sha256 = "sha256-ep69Rrm8Ek0lkgctz6vDAZ1MZ8kWKZSyIvMMAmzTngA="; }; propagatedBuildInputs = [ From 5c953fb7af849bbb49e87233f9c899c733299aaa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Aug 2022 17:09:44 +0200 Subject: [PATCH 6/8] python310Packages.karton-autoit-ripper: 1.1.0 -> 1.2.0 --- .../python-modules/karton-autoit-ripper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-autoit-ripper/default.nix b/pkgs/development/python-modules/karton-autoit-ripper/default.nix index ea79a5f453f2..a5d4f2c86a29 100644 --- a/pkgs/development/python-modules/karton-autoit-ripper/default.nix +++ b/pkgs/development/python-modules/karton-autoit-ripper/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "karton-autoit-ripper"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "1gclrrc0n72bfj4m55kk8d69zrfvnlwm9692ni9w7d2231mvv7bw"; + sha256 = "sha256-D+M3JsIN8LUWg8GVweEzySHI7KaBb6cNHHn4pXoq55M="; }; propagatedBuildInputs = [ From 8f39ebbaf98abfa39880714278d95cfe4f6dffc0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Aug 2022 22:55:41 +0200 Subject: [PATCH 7/8] python310Packages.karton-classifier: 1.3.0 -> 1.4.0 --- .../karton-classifier/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/karton-classifier/default.nix b/pkgs/development/python-modules/karton-classifier/default.nix index 8195632bdfd4..bcf4b075dfaf 100644 --- a/pkgs/development/python-modules/karton-classifier/default.nix +++ b/pkgs/development/python-modules/karton-classifier/default.nix @@ -10,7 +10,8 @@ buildPythonPackage rec { pname = "karton-classifier"; - version = "1.2.0"; + version = "1.4.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AG2CtNMgXYfbdlOqB1ZdjMT8H67fsSMXTgiFg6K41IQ="; + hash = "sha256-TRmAin0TAOIwR5EBMwTOJ9QaHO+mOx/eAjgqvyQZDj4="; }; propagatedBuildInputs = [ @@ -27,17 +28,25 @@ buildPythonPackage rec { python-magic ]; + checkInputs = [ + pytestCheckHook + ]; + postPatch = '' substituteInPlace requirements.txt \ --replace "chardet==3.0.4" "chardet" \ --replace "python-magic==0.4.18" "python-magic" ''; - checkInputs = [ - pytestCheckHook + pythonImportsCheck = [ + "karton.classifier" ]; - pythonImportsCheck = [ "karton.classifier" ]; + disabledTests = [ + # Tests expecting results from a different version of libmagic + "test_process_archive_ace" + "test_process_runnable_win32_lnk" + ]; meta = with lib; { description = "File type classifier for the Karton framework"; From 0501066c2328c68635bcfeed05741cdbee2b89d3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Aug 2022 23:03:50 +0200 Subject: [PATCH 8/8] python310Packages.karton-core: 4.4.1 -> 5.0.0 --- .../python-modules/karton-core/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index b839230b5f28..d4e95481327b 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -1,23 +1,26 @@ { lib +, boto3 , buildPythonPackage , fetchFromGitHub -, minio , python , redis }: buildPythonPackage rec { pname = "karton-core"; - version = "4.4.1"; + version = "5.0.0"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - sha256 = "sha256-smgKrFexuL0bgt/1Ikm1tpSGPJNJm7Ko68iZn3AQw5E="; + hash = "sha256-0B2u2xnrGc3iQ8B9iAQ3fcovQQCPqdFsn5evgdDwg5M="; }; - propagatedBuildInputs = [ minio redis ]; + propagatedBuildInputs = [ + boto3 + redis + ]; checkPhase = '' runHook preCheck @@ -25,10 +28,14 @@ buildPythonPackage rec { runHook postCheck ''; + pythonImportsCheck = [ + "karton.core" + ]; + meta = with lib; { description = "Distributed malware processing framework"; homepage = "https://karton-core.readthedocs.io/"; - maintainers = with maintainers; [ chivay ]; license = licenses.bsd3; + maintainers = with maintainers; [ chivay fab ]; }; }