Unverified Commit cb6bde84 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #238808 from fabaff/karton-dashboard-bump 

python311Packages.karton-core: 5.0.1 -> 5.1.0, python311Packages.karton-dashboard: 1.4.0 -> 1.5.0,  python311Packages.malduck: 4.3.0 -> 4.3.2
parents 1b56469c 1935d01c

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

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


buildPythonPackage rec {

  pname = "karton-classifier";

  version = "1.4.0";

  version = "2.0.0";

  format = "setuptools";



  disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec { 
    owner = "CERT-Polska";

    repo = pname;

    rev = "refs/tags/v${version}";

    hash = "sha256-TRmAin0TAOIwR5EBMwTOJ9QaHO+mOx/eAjgqvyQZDj4=";

    hash = "sha256-DH8I4Lbbs2TVMvYlvh/P2I/7O4+VechP2JDDVHNsTSg=";

  };



  propagatedBuildInputs = [

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

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


buildPythonPackage rec {

  pname = "karton-core";

  version = "5.0.1";

  version = "5.1.0";

  format = "setuptools";



  disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec { 
    owner = "CERT-Polska";

    repo = "karton";

    rev = "refs/tags/v${version}";

    hash = "sha256-TKO0l0AKsC9MMB58ao/EXcJ9k/J3y3S9tc127H7vA6w=";

    hash = "sha256-IhxMei6KkPsDnUkV4+zxSMI7rgZgOvbHQFqJAC1b5iw=";

  };



  propagatedBuildInputs = [

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

+2 −12
Original line number Diff line number Diff line 
{ lib

, buildPythonPackage

, fetchFromGitHub

, fetchpatch

, flask

, karton-core

, mistune
@@ -13,7 +12,7 @@ 


buildPythonPackage rec {

  pname = "karton-dashboard";

  version = "1.4.0";

  version = "1.5.0";

  format = "setuptools";



  disabled = pythonOlder "3.7";
@@ -22,18 +21,9 @@ buildPythonPackage rec { 
    owner = "CERT-Polska";

    repo = pname;

    rev = "refs/tags/v${version}";

    hash = "sha256-XMyQ0mRF4y61hqlqdxC+He+697P1URfOXQUMnV0pT7o=";

    hash = "sha256-O7Wrl9+RWkHPO0+9aue1Nlv0263qX8Thnh5FmnoKjxU=";

  };



  patches = [

    # Allow later mistune, https://github.com/CERT-Polska/karton-dashboard/pull/68

    (fetchpatch {

      name = "update-mistune.patch";

      url = "https://github.com/CERT-Polska/karton-dashboard/commit/d0a2a1ffd21e9066acca77434acaff7b20e460d0.patch";

      hash = "sha256-LOqeLWoCXmVTthruBiQUYR03yPOPHhgYF/fJMhhT6Wo=";

    })

  ];



  pythonRelaxDeps = [

    "Flask"

    "mistune"

pkgs/development/python-modules/malduck/default.nix

+2 −5
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


buildPythonPackage rec {

  pname = "malduck";

  version = "4.3.0";

  version = "4.3.2";

  format = "setuptools";



  disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec { 
    owner = "CERT-Polska";

    repo = pname;

    rev = "refs/tags/v${version}";

    hash = "sha256-1gwJhlhRLnh01AIJj07Wpba8X7V5AfACuJmZX+cfT6Y=";

    hash = "sha256-3joIfhQBJzKdoU3FNW/yAHsQa/lMMbw3wGEQTyOBrOQ=";

  };



  propagatedBuildInputs = [
@@ -60,8 +60,5 @@ buildPythonPackage rec { 
    changelog = "https://github.com/CERT-Polska/malduck/releases/tag/v${version}";

    license = with licenses; [ bsd3 ];

    maintainers = with maintainers; [ fab ];

    # Compatibility issues with yara-python v4.3.0

    # https://github.com/CERT-Polska/malduck/issues/88

    broken = true;

  };

}