From 93aea44648a19869812c65aa28954756ba56a469 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Sep 2024 13:16:12 +0200 Subject: [PATCH 1/2] python312Packages.marshmallow-dataclass: 8.7.0 -> 8.7.1 Diff: https://github.com/lovasoa/marshmallow_dataclass/compare/refs/tags/v8.7.0...v8.7.1 Changelog: https://github.com/lovasoa/marshmallow_dataclass/blob/v8.7.1/CHANGELOG.md --- .../python-modules/marshmallow-dataclass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 163bc0516787..3f270d21bce4 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "marshmallow-dataclass"; - version = "8.7.0"; + version = "8.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lovasoa"; repo = "marshmallow_dataclass"; rev = "refs/tags/v${version}"; - hash = "sha256-O96Xv732euS0X+1ilhLVMoazpC4kUSJvyVYwdj10e2E="; + hash = "sha256-0OXP78oyNe/UcI05NHskPyXAuX3dwAW4Uz4dI4b8KV0="; }; propagatedBuildInputs = [ From 00653cc271b6b31adafef580f08d24e45e6421ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Sep 2024 13:21:28 +0200 Subject: [PATCH 2/2] python312Packages.marshmallow-dataclass: refactor --- .../marshmallow-dataclass/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 3f270d21bce4..a06997a09e40 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -6,16 +6,18 @@ pytestCheckHook, pythonAtLeast, pythonOlder, + setuptools, typeguard, + typing-extensions, typing-inspect, }: buildPythonPackage rec { pname = "marshmallow-dataclass"; version = "8.7.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "lovasoa"; @@ -24,10 +26,12 @@ buildPythonPackage rec { hash = "sha256-0OXP78oyNe/UcI05NHskPyXAuX3dwAW4Uz4dI4b8KV0="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ marshmallow typing-inspect - ]; + ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; nativeCheckInputs = [ pytestCheckHook @@ -51,7 +55,7 @@ buildPythonPackage rec { description = "Automatic generation of marshmallow schemas from dataclasses"; homepage = "https://github.com/lovasoa/marshmallow_dataclass"; changelog = "https://github.com/lovasoa/marshmallow_dataclass/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; }