From 28ed9b141ffb252c04d1e146c7219ea627eb3889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 22 May 2023 02:51:43 -0700
Subject: [PATCH] poetry: 1.4.2 -> 1.5.1

Diff: https://github.com/python-poetry/poetry/compare/refs/tags/1.4.2...1.5.1

Changelog: https://github.com/python-poetry/poetry/blob/refs/tags/1.5.1/CHANGELOG.md
---
 .../package-management/poetry/default.nix     | 29 +++++++++++--------
 .../package-management/poetry/unwrapped.nix   |  5 ++--
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix
index 40d6f2c8647e..928023e0b41b 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
@@ -22,24 +23,28 @@ let
           self.lockfile
         ];
       });
-      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;
-      });
       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
+        ];
       });
     } // (plugins self);
   };
diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix
index 550a8335e26c..839b1882aa05 100644
--- a/pkgs/tools/package-management/poetry/unwrapped.nix
+++ b/pkgs/tools/package-management/poetry/unwrapped.nix
@@ -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 = [
@@ -123,6 +123,7 @@ buildPythonPackage rec {
   '';
 
   disabledTests = [
+    "test_installer_with_pypi_repository"
     # touches network
     "git"
     "solver"