From 8c7245f5b98e87ec9c2e6365adb49e179033b5c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 30 Nov 2023 18:31:22 +0100 Subject: [PATCH 1/2] python311Packages.mashumaro: refactor --- .../python-modules/mashumaro/default.nix | 47 ++++++++++++------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index f898acad5144..b4445a6e2cbd 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -1,29 +1,30 @@ { lib , buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools -, typing-extensions -, orjson -, msgpack -, pyyaml -, tomli-w -, tomli -, pytestCheckHook , ciso8601 +, fetchFromGitHub +, msgpack +, orjson , pendulum , pytest-mock +, pytestCheckHook +, pythonOlder +, pyyaml +, setuptools +, tomli +, tomli-w +, typing-extensions }: buildPythonPackage rec { pname = "mashumaro"; version = "3.10"; - format = "pyproject"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Fatal1ty"; - repo = pname; + repo = "mashumaro"; rev = "refs/tags/v${version}"; hash = "sha256-PvMEwIxurDGwYMCmNFThedxDY4vwATHYwMlXkucNuwM="; }; @@ -37,10 +38,20 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - orjson = [ orjson ]; - msgpack = [ msgpack ]; - yaml = [ pyyaml ]; - toml = [ tomli-w ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + orjson = [ + orjson + ]; + msgpack = [ + msgpack + ]; + yaml = [ + pyyaml + ]; + toml = [ + tomli-w + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; }; nativeCheckInputs = [ @@ -55,7 +66,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Fast and well tested serialization library on top of dataclasses"; + description = "Serialization library on top of dataclasses"; homepage = "https://github.com/Fatal1ty/mashumaro"; changelog = "https://github.com/Fatal1ty/mashumaro/releases/tag/v${version}"; license = licenses.asl20; From eb2163aea9cba8c5833848929301b8a2aafaf6f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 30 Nov 2023 18:33:20 +0100 Subject: [PATCH 2/2] python311Packages.mashumaro: 3.10 -> 3.11 Diff: https://github.com/Fatal1ty/mashumaro/compare/refs/tags/v3.10...v3.11 Changelog: https://github.com/Fatal1ty/mashumaro/releases/tag/v3.11 --- pkgs/development/python-modules/mashumaro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index b4445a6e2cbd..d61ddf90362d 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mashumaro"; - version = "3.10"; + version = "3.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Fatal1ty"; repo = "mashumaro"; rev = "refs/tags/v${version}"; - hash = "sha256-PvMEwIxurDGwYMCmNFThedxDY4vwATHYwMlXkucNuwM="; + hash = "sha256-7gRbTNNK8elWsL0ub7c/EeswIk4xxJOxKVk8HmvWMZA="; }; nativeBuildInputs = [