From 23392b616f0eab24943aade091a76d73c74b739d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 26 Mar 2024 04:20:00 +0000 Subject: [PATCH 1/2] python311Packages.flask-restx: fix build on Darwin --- pkgs/development/python-modules/flask-restx/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index 106f6cc82165..e7f348c243f2 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -58,6 +59,8 @@ buildPythonPackage rec { "--deselect=tests/test_inputs.py::URLTest::test_check" "--deselect=tests/test_inputs.py::EmailTest::test_valid_value_check" "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" + ] ++ lib.optionals stdenv.isDarwin [ + "--deselect=tests/test_inputs.py::EmailTest::test_invalid_values_check" ]; disabledTests = [ From 6699cb2452e5f643dd62683a0badd28e549e1c47 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 28 Mar 2024 08:45:07 +0100 Subject: [PATCH 2/2] python311Packages.flask-restx: refactor --- .../python-modules/flask-restx/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index e7f348c243f2..1a9a27dc0315 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -17,24 +17,29 @@ , pytest-mock , pytest-benchmark , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "flask-restx"; version = "1.3.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "python-restx"; - repo = pname; + repo = "flask-restx"; rev = "refs/tags/${version}"; hash = "sha256-CBReP/u96fsr28lMV1BfLjjdBMXEvsD03wvsxkIcteI="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aniso8601 flask importlib-resources