From 29646474f420350a6e93f7433bb7dd3642696229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 27 Feb 2023 18:02:44 -0800 Subject: [PATCH] poetry: update dependencies --- pkgs/tools/package-management/poetry/default.nix | 9 --------- pkgs/tools/package-management/poetry/unwrapped.nix | 7 ++++--- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index f2d07bbb2581..590639db3669 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -9,15 +9,6 @@ let poetry = self.callPackage ./unwrapped.nix { }; # version overrides required by poetry and its plugins - dulwich = super.dulwich.overridePythonAttrs (old: rec { - version = "0.21.3"; - src = self.fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-fKO0U9dn64Oz7Fjwz83JNIdaNBzf2w3FXBQxyWYIz4M="; - }; - }); - platformdirs = super.platformdirs.overridePythonAttrs (old: rec { version = "2.6.2"; src = fetchFromGitHub { diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix index 371bd63d48b4..56958df7e82f 100644 --- a/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/pkgs/tools/package-management/poetry/unwrapped.nix @@ -14,6 +14,7 @@ , installer , jsonschema , keyring +, lockfile , packaging , pexpect , pkginfo @@ -26,11 +27,11 @@ , shellingham , tomlkit , trove-classifiers +, urllib3 , virtualenv , xattr , tomli , importlib-metadata -, backports-cached-property , cachy , deepdiff , flatdict @@ -70,6 +71,7 @@ buildPythonPackage rec { installer jsonschema keyring + lockfile packaging pexpect pkginfo @@ -82,6 +84,7 @@ buildPythonPackage rec { shellingham tomlkit trove-classifiers + urllib3 virtualenv ] ++ lib.optionals (stdenv.isDarwin) [ xattr @@ -89,8 +92,6 @@ buildPythonPackage rec { tomli ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata - ] ++ lib.optionals (pythonOlder "3.8") [ - backports-cached-property ] ++ cachecontrol.optional-dependencies.filecache; postInstall = ''