From edf111a2f22ff6200a0de67e08759791dcbbc83f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 12:58:02 +0100 Subject: [PATCH] python311Packages.marshmallow-polyfield: refactor --- .../marshmallow-polyfield/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index 24d117eb322e..81eed71d3016 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -4,22 +4,32 @@ , marshmallow , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "marshmallow-polyfield"; version = "5.10"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Bachmann1234"; - repo = pname; - rev = "v${version}"; + repo = "marshmallow-polyfield"; + rev = "refs/tags/v${version}"; hash = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=marshmallow_polyfield" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ marshmallow ]; @@ -28,11 +38,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=marshmallow_polyfield" "" - ''; - pythonImportsCheck = [ "marshmallow" ];