From 3886eed32cbfae19d04f4b5f63cc4047092eef9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 7 Aug 2021 20:19:08 +0200 Subject: [PATCH 1/3] python39Packages.pytest-mockservers: move pytest to buildInputs --- .../python-modules/pytest-mockservers/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest-mockservers/default.nix b/pkgs/development/python-modules/pytest-mockservers/default.nix index 6de88632027f..4022befcb14d 100644 --- a/pkgs/development/python-modules/pytest-mockservers/default.nix +++ b/pkgs/development/python-modules/pytest-mockservers/default.nix @@ -31,9 +31,12 @@ buildPythonPackage rec { poetry-core ]; + buildInputs = [ + pytest + ]; + propagatedBuildInputs = [ aiohttp - pytest pytest-asyncio ]; From a9f116715b80329c21657e91fe8eb2464a9d1533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 7 Aug 2021 20:23:24 +0200 Subject: [PATCH 2/3] python39Packages.pytest-resource-path: move pytest to buildInputs, remove pytest-runner --- .../python-modules/pytest-resource-path/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytest-resource-path/default.nix b/pkgs/development/python-modules/pytest-resource-path/default.nix index a0517ee20aa8..7476801794c3 100644 --- a/pkgs/development/python-modules/pytest-resource-path/default.nix +++ b/pkgs/development/python-modules/pytest-resource-path/default.nix @@ -3,7 +3,6 @@ , pythonOlder , fetchFromGitHub , colorama -, pytest-runner , pytest , pytestCheckHook }: @@ -20,13 +19,17 @@ buildPythonPackage rec { sha256 = "1siv3pk4fsabz254fdzr7c0pxy124habnbw4ym66pfk883fr96g2"; }; - nativeBuildInputs = [ - pytest-runner + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" + ''; + + buildInputs = [ + pytest ]; propagatedBuildInputs = [ colorama - pytest ]; checkInputs = [ From ae43a849a9852904e8e4b421953179ca4d0260aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 7 Aug 2021 20:23:40 +0200 Subject: [PATCH 3/3] python39Packages.roonapi: remove unused input --- pkgs/development/python-modules/roonapi/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix index aded311feab0..ccc5749387b1 100644 --- a/pkgs/development/python-modules/roonapi/default.nix +++ b/pkgs/development/python-modules/roonapi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , ifaddr , poetry-core , pythonOlder