Unverified Commit 0c42cbe8 authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #185673 from fabaff/karton-bump 

python310Packages.karton-core: 4.4.1 -> 5.0.0
parents 22dee2d3 0501066c

pkgs/development/python-modules/karton-asciimagic/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/development/python-modules/karton-autoit-ripper/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/development/python-modules/karton-classifier/default.nix

+14 −5
Original line number Diff line number Diff line
@@ -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";

pkgs/development/python-modules/karton-config-extractor/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/development/python-modules/karton-core/default.nix

+12 −5
Original line number Diff line number Diff line 
{ 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 ];

  };

}