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
This commit is contained in:
Fabian Affolter 2023-06-22 16:33:00 +02:00 committed by GitHub
commit cb6bde84e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 21 deletions

View file

@ -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 = [

View file

@ -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 = [

View file

@ -1,7 +1,6 @@
{ 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"

View file

@ -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;
};
}