diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index 5d132c7a842cb..48263c1f3090f 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchFromGitHub +, fetchPypi }: let @@ -8,24 +9,59 @@ let packageOverrides = self: super: { poetry = self.callPackage ./unwrapped.nix { }; + filelock = super.filelock.overridePythonAttrs (old: rec { + version = "3.12.2"; + src = fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-ACdAUY2KpZomsMduEPuMbhXq6CXTS2/fZwMz/XuTjYE="; + }; + nativeCheckInputs = with self; [ + pytest-mock + pytestCheckHook + ]; + }); # version overrides required by poetry and its plugins platformdirs = super.platformdirs.overridePythonAttrs (old: rec { - version = "2.6.2"; + version = "3.8.0"; src = fetchFromGitHub { owner = "platformdirs"; repo = "platformdirs"; rev = "refs/tags/${version}"; - hash = "sha256-yGpDAwn8Kt6vF2K2zbAs8+fowhYQmvsm/87WJofuhME="; + hash = "sha256-eQAEHl61aC/B44G3zBqMjDVAQF8GerpJbeQ1nT4uQ4Q="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; }); poetry-core = super.poetry-core.overridePythonAttrs (old: rec { - version = "1.5.2"; + version = "1.6.1"; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; rev = version; - hash = "sha256-GpZ0vMByHTu5kl7KrrFFK2aZMmkNO7xOEc8NI2H9k34="; + hash = "sha256-Gc22Y2T4uO39jiOqEUFeOfnVCbknuDjmzFPZgk2eY74="; + }; + nativeCheckInputs = old.nativeCheckInputs ++ [ + self.tomli-w + ]; + }); + virtualenv = super.virtualenv.overridePythonAttrs (old: rec { + version = "20.23.1"; + src = fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-j/GaOMECHHQhSO3E+By0PX+MaBbS7eKrcq9bhMdJreE="; + }; + nativeCheckInputs = old.nativeCheckInputs ++ [ + self.time-machine + ]; + }); + poetry-plugin-export = super.poetry-plugin-export.overridePythonAttrs(old: { + version = "1.4.0"; + src = fetchFromGitHub { + owner = "python-poetry"; + repo = old.pname; + rev = "refs/tags/${old.version}"; + hash = "sha256-okI91Z9u5w7IHpPb9jL4Hb8+MkYJEF2qm0mqqCdyKbk="; }; }); }; @@ -33,7 +69,6 @@ let plugins = with python.pkgs; { poetry-audit-plugin = callPackage ./plugins/poetry-audit-plugin.nix { }; - poetry-plugin-up = callPackage ./plugins/poetry-plugin-up.nix { }; }; # selector is a function mapping pythonPackages to a list of plugins @@ -52,7 +87,7 @@ let rm $out/nix-support/propagated-build-inputs ''; - passthru = rec { + passthru = { inherit plugins withPlugins python; }; })); diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix deleted file mode 100644 index 71b7b96c486d8..0000000000000 --- a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-up.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, fetchFromGitHub -, buildPythonPackage -, poetry-core -, pytestCheckHook -, pytest-mock -, poetry -}: - -buildPythonPackage rec { - pname = "poetry-plugin-up"; - version = "0.3.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "MousaZeidBaker"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-QDfXgLkwh5rfyNZv0S7+cq6ubldXsbuCiTr6VYx8ZQs="; - }; - - nativeBuildInputs = [ - poetry-core - ]; - - nativeCheckInputs = [ - pytestCheckHook - pytest-mock - poetry - ]; - - preCheck = '' - export HOME=$TMPDIR - ''; - - meta = with lib; { - description = "Poetry plugin to simplify package updates"; - homepage = "https://github.com/MousaZeidBaker/poetry-plugin-up"; - changelog = "https://github.com/MousaZeidBaker/poetry-plugin-up/releases/tag/${version}"; - license = licenses.mit; - maintainers = [ maintainers.k900 ]; - }; -} diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix index 550a8335e26c3..4c1264b51bb57 100644 --- a/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/pkgs/tools/package-management/poetry/unwrapped.nix @@ -25,11 +25,11 @@ , requests , requests-toolbelt , shellingham -, tomlkit , trove-classifiers , urllib3 , virtualenv , xattr +, tomlkit , tomli , importlib-metadata , cachy @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.4.2"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AiRQFZA5+M1niTzj1RO2lx0QFOMmSzpQo1gzauyTblg="; + hash = "sha256-1zqfGzSI5RDACSNcz0tLA4VKMFwE5uD/YqOkgpzg2nQ="; }; nativeBuildInputs = [ @@ -141,6 +141,7 @@ buildPythonPackage rec { "test_prepare_directory" "test_prepare_directory_with_extensions" "test_prepare_directory_editable" + "test_installer_with_pypi_repository" ] ++ 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"