diff --git a/pkgs/by-name/po/poetry/package.nix b/pkgs/by-name/po/poetry/package.nix index e5ce69dbc168..2422753a8ab4 100644 --- a/pkgs/by-name/po/poetry/package.nix +++ b/pkgs/by-name/po/poetry/package.nix @@ -11,18 +11,6 @@ let { poetry = self.callPackage ./unwrapped.nix { }; - # Poetry 2.1.4 officially requires virtualenv >=20.26.6, <20.33.0 - # otherwise will be incompatible with python312 - # see: https://github.com/python-poetry/poetry/issues/10490 - virtualenv = super.virtualenv.overridePythonAttrs (old: rec { - version = "20.30.0"; - src = fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-gAhjFivKpUUKbk1yEElzDn8trgdyDgkCsOQEC9b5rag="; - }; - }); - # The versions of Poetry and poetry-core need to match exactly, # and poetry-core in nixpkgs requires a staging cycle to be updated, # so apply an override here. @@ -30,22 +18,12 @@ 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 = "2.1.3"; + version = "2.2.0"; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; tag = version; - hash = "sha256-CgaWlqjvBTN7GuerzmO5IiEdXxYH6pmTDj9IsNJlCBE="; - }; - }); - - findpython = super.findpython.overridePythonAttrs (old: rec { - version = "0.6.3"; - - src = fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-WGPqVVVtiq3Gk0gaFKxPNiSVJxnvwcVZGrsLSp6WXJQ="; + hash = "sha256-WLPG8BiM+927qSC+ly5H2IAE2Htm8+wLEjK2AFnMJ58="; }; }); } diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix index 9a1486765cce..cf6ba5946c4a 100644 --- a/pkgs/by-name/po/poetry/unwrapped.nix +++ b/pkgs/by-name/po/poetry/unwrapped.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "2.1.4"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = "poetry"; tag = version; - hash = "sha256-6QYg+QRZ60hgcAvKiUqC3gW7P0oK0vaFps9NYIPhBb8="; + hash = "sha256-CI3+0P+eIFpdnyxy1zhaEMWAsX/R0qqdAvVEQ5fqnhk="; }; build-system = [