From c9e9cff1551690923f20f4c7ccde20945a257342 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Feb 2024 20:17:23 +0100 Subject: [PATCH 1/2] python311Packages.karton-core: 5.3.2 -> 5.3.3 Diff: https://github.com/CERT-Polska/karton/compare/refs/tags/v5.3.2...v5.3.3 Changelog: https://github.com/CERT-Polska/karton/releases/tag/v5.3.3 --- 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 a934b793c60e..67de7d16c928 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "karton-core"; - version = "5.3.2"; + version = "5.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-/MPD83sBo9n/dI1uXbHbjvz6upJSJrssMGmGwfQ+KE8="; + hash = "sha256-RVHhMKoQAqsddziK/vWGynSL9mxMuccNEGzoJTx8KAA="; }; propagatedBuildInputs = [ From 6804dd51a7e0a566993c27e8bf20955fc7ae7246 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 29 Feb 2024 20:18:57 +0100 Subject: [PATCH 2/2] python311Packages.karton-core: refactor --- pkgs/development/python-modules/karton-core/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 67de7d16c928..6746fd6eb710 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -3,15 +3,16 @@ , buildPythonPackage , fetchFromGitHub , orjson -, unittestCheckHook , pythonOlder , redis +, setuptools +, unittestCheckHook }: buildPythonPackage rec { pname = "karton-core"; version = "5.3.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-RVHhMKoQAqsddziK/vWGynSL9mxMuccNEGzoJTx8KAA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ boto3 orjson