diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index 3317e785d0b8..dda8d0a132a1 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -12,13 +12,14 @@ let # We keep the override around even when the versions match, as # it's likely to become relevant again after the next Poetry update. poetry-core = super.poetry-core.overridePythonAttrs (old: rec { - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; rev = "refs/tags/${version}"; - hash = "sha256-vvwKbzGlvv2LTbXfJxQVM3nUXFGntgJxsku6cbRxCzw="; + hash = "sha256-L8lR9sUdRYqjkDCQ0XHXZm5X6xD40t1gxlGiovvb/+8="; }; + patches = [ ]; }); } // (plugins self); python = python3.override (old: { @@ -39,7 +40,7 @@ let withPlugins = selector: let selected = selector (plugins python.pkgs); in python.pkgs.toPythonApplication (python.pkgs.poetry.overridePythonAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ selected; + dependencies = old.dependencies ++ selected; # save some build time when adding plugins by disabling tests doCheck = selected == [ ]; diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix index 4a520f201883..8e24ed705b48 100644 --- a/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/pkgs/tools/package-management/poetry/unwrapped.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.8.3"; + version = "1.8.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -47,9 +47,13 @@ buildPythonPackage rec { owner = "python-poetry"; repo = "poetry"; rev = "refs/tags/${version}"; - hash = "sha256-PPHt9GG5XJzrhnuAS8L+0Pa3El3RNCdEbXbLnHopDWg="; + hash = "sha256-pk57Jxf4hkMKLn1pOa9BtHLwLJ6qmXc55TqQN5Vr2k8="; }; + build-system = [ + poetry-core + ]; + nativeBuildInputs = [ installShellFiles ]; @@ -57,9 +61,10 @@ buildPythonPackage rec { pythonRelaxDeps = [ "dulwich" "keyring" + "virtualenv" ]; - propagatedBuildInputs = [ + dependencies = [ build cachecontrol cleo