From e5b51cb2ffdd64dd9e2a179bcda842f3358fdece Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Jun 2023 21:26:58 +0200 Subject: [PATCH 1/4] python311Packages.karton-core: 5.0.1 -> 5.1.0 Diff: https://github.com/CERT-Polska/karton/compare/refs/tags/v5.0.1...v5.1.0 Changelog: https://github.com/CERT-Polska/karton/releases/tag/v5.1.0 --- pkgs/development/python-modules/karton-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 0c2a44aa3e6b..43d65c4f0f75 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -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 = [ From 856ec13017d59fedc53bf99275f088dd8635549b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Jun 2023 21:27:09 +0200 Subject: [PATCH 2/4] python311Packages.karton-dashboard: 1.4.0 -> 1.5.0 Diff: https://github.com/CERT-Polska/karton-dashboard/compare/refs/tags/v1.4.0...v1.5.0 Changelog: https://github.com/CERT-Polska/karton-dashboard/releases/tag/v1.5.0 --- .../python-modules/karton-dashboard/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index a055c423374b..60e21e63b116 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -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" From aaf800875e3d09d5d89d345095d8216cbf7f19ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jun 2023 14:11:51 +0200 Subject: [PATCH 3/4] python311Packages.karton-classifier: 1.4.0 -> 2.0.0 Diff: https://github.com/CERT-Polska/karton-classifier/compare/refs/tags/v1.4.0...v2.0.0 Changelog: https://github.com/CERT-Polska/karton-classifier/releases/tag/v2.0.0 --- pkgs/development/python-modules/karton-classifier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-classifier/default.nix b/pkgs/development/python-modules/karton-classifier/default.nix index bb59fde71865..689d67d50910 100644 --- a/pkgs/development/python-modules/karton-classifier/default.nix +++ b/pkgs/development/python-modules/karton-classifier/default.nix @@ -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 = [ From 1935d01ca763108bb2faa2c8989af35506b7cbd3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jun 2023 14:36:41 +0200 Subject: [PATCH 4/4] python311Packages.malduck: 4.3.0 -> 4.3.2 Diff: https://github.com/CERT-Polska/malduck/compare/refs/tags/v4.3.0...v4.3.2 Changelog: https://github.com/CERT-Polska/malduck/releases/tag/v4.3.2 --- pkgs/development/python-modules/malduck/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/malduck/default.nix b/pkgs/development/python-modules/malduck/default.nix index b3ca15ee3c63..0ae7abb72143 100644 --- a/pkgs/development/python-modules/malduck/default.nix +++ b/pkgs/development/python-modules/malduck/default.nix @@ -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; }; }