From 379d03c043901e5fdfc0a4e1d21d4f49ef6b75bc Mon Sep 17 00:00:00 2001 From: Morgan Lokhorst Date: Wed, 29 Jan 2025 20:03:06 +1100 Subject: [PATCH 1/2] poetryPlugins.poetry-plugin-shell: Fix tests on darwin The fix for #281369 that was added in #281397 was not brought across when poetry-plugin-shell was split out from poetry with the update to poetry 2.0.0. --- .../po/poetry/plugins/poetry-plugin-shell.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix index 68526526ce86..a3eb42a24dc9 100644 --- a/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix +++ b/pkgs/by-name/po/poetry/plugins/poetry-plugin-shell.nix @@ -2,6 +2,7 @@ buildPythonPackage, fetchFromGitHub, lib, + stdenv, pexpect, poetry, poetry-core, @@ -9,6 +10,7 @@ pytest-xdist, pytestCheckHook, shellingham, + darwin, }: buildPythonPackage rec { @@ -34,11 +36,15 @@ buildPythonPackage rec { shellingham ]; - nativeCheckInputs = [ - pytest-mock - pytest-xdist - pytestCheckHook - ]; + nativeCheckInputs = + [ + pytest-mock + pytest-xdist + pytestCheckHook + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.ps + ]; meta = { changelog = "https://github.com/python-poetry/poetry-plugin-shell/blob/${src.tag}/CHANGELOG.md"; From 48493f8a5f41a437f2131ec27a2ecea71dfd2438 Mon Sep 17 00:00:00 2001 From: Morgan Lokhorst Date: Thu, 30 Jan 2025 15:34:48 +1100 Subject: [PATCH 2/2] poetry: Remove superfluous darwin.ps nativeCheckInput --- pkgs/by-name/po/poetry/unwrapped.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix index ba26b7d54be0..f3146cea2e61 100644 --- a/pkgs/by-name/po/poetry/unwrapped.nix +++ b/pkgs/by-name/po/poetry/unwrapped.nix @@ -32,7 +32,6 @@ httpretty, pytest-mock, pytest-xdist, - darwin, }: buildPythonPackage rec { @@ -110,17 +109,13 @@ buildPythonPackage rec { --zsh <($out/bin/poetry completions zsh) \ ''; - nativeCheckInputs = - [ - deepdiff - pytestCheckHook - httpretty - pytest-mock - pytest-xdist - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.ps - ]; + nativeCheckInputs = [ + deepdiff + pytestCheckHook + httpretty + pytest-mock + pytest-xdist + ]; preCheck = ( ''