diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index eaaa2dc57d47..f2d07bbb2581 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -1,5 +1,6 @@ { lib , python3 +, fetchFromGitHub }: let @@ -9,13 +10,24 @@ let # version overrides required by poetry and its plugins dulwich = super.dulwich.overridePythonAttrs (old: rec { - version = "0.20.50"; + version = "0.21.3"; src = self.fetchPypi { inherit (old) pname; inherit version; - hash = "sha256-UKlBeWssZ1vjm+co1UDBa1t853654bP4VWUOzmgy0r4="; + hash = "sha256-fKO0U9dn64Oz7Fjwz83JNIdaNBzf2w3FXBQxyWYIz4M="; }; }); + + platformdirs = super.platformdirs.overridePythonAttrs (old: rec { + version = "2.6.2"; + src = fetchFromGitHub { + owner = "platformdirs"; + repo = "platformdirs"; + rev = "refs/tags/${version}"; + hash = "sha256-yGpDAwn8Kt6vF2K2zbAs8+fowhYQmvsm/87WJofuhME="; + }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + }); }; }; @@ -41,7 +53,7 @@ let ''; passthru = rec { - inherit plugins withPlugins; + inherit plugins withPlugins python; }; })); in withPlugins (ps: [ ]) diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix index e98c571ddb75..371bd63d48b4 100644 --- a/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/pkgs/tools/package-management/poetry/unwrapped.nix @@ -4,12 +4,14 @@ , pythonOlder , fetchFromGitHub , installShellFiles +, build , cachecontrol , cleo , crashtest , dulwich , filelock , html5lib +, installer , jsonschema , keyring , packaging @@ -18,6 +20,7 @@ , platformdirs , poetry-core , poetry-plugin-export +, pyproject-hooks , requests , requests-toolbelt , shellingham @@ -40,7 +43,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.3.2"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -49,7 +52,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-12EiEGI9Vkb6EUY/W2KWeLigxWra1Be4ozvi8njBpEU="; + hash = "sha256-vbG9nsrCvytpKLJbC1EKeyTSjaDlsKvdRCwT6aSq6B4="; }; nativeBuildInputs = [ @@ -57,12 +60,14 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + build cachecontrol cleo crashtest dulwich filelock html5lib + installer jsonschema keyring packaging @@ -71,6 +76,7 @@ buildPythonPackage rec { platformdirs poetry-core poetry-plugin-export + pyproject-hooks requests requests-toolbelt shellingham @@ -129,6 +135,11 @@ buildPythonPackage rec { "lock" # fs permission errors "test_builder_should_execute_build_scripts" + # poetry.installation.chef.ChefBuildError: Backend 'poetry.core.masonry.api' is not available. + "test_prepare_sdist" + "test_prepare_directory" + "test_prepare_directory_with_extensions" + "test_prepare_directory_editable" ] ++ lib.optionals (pythonAtLeast "3.10") [ # RuntimeError: 'auto_spec' might be a typo; use unsafe=True if this is intended "test_info_setup_complex_pep517_error"