From db0be3a5588322fb1cde9d0fd666a4cf08949abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 5 Jan 2025 05:01:08 -0800
Subject: [PATCH] poetry: 1.8.5 -> 2.0.0

Diff: https://github.com/python-poetry/poetry/compare/refs/tags/1.8.5...2.0.0

Changelog: https://github.com/python-poetry/poetry/blob/refs/tags/2.0.0/CHANGELOG.md
---
 pkgs/by-name/po/poetry/package.nix   | 19 ++++++++++++++++---
 pkgs/by-name/po/poetry/unwrapped.nix | 25 ++++++++++++++-----------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/po/poetry/package.nix b/pkgs/by-name/po/poetry/package.nix
index b6d61b80e179..8bfd4547c756 100644
--- a/pkgs/by-name/po/poetry/package.nix
+++ b/pkgs/by-name/po/poetry/package.nix
@@ -17,14 +17,27 @@ 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 = "1.9.1";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "python-poetry";
           repo = "poetry-core";
-          rev = "refs/tags/${version}";
-          hash = "sha256-L8lR9sUdRYqjkDCQ0XHXZm5X6xD40t1gxlGiovvb/+8=";
+          tag = version;
+          hash = "sha256-3dmvFn2rxtR0SK8oiEHIVJhpJpX4Mm/6kZnIYNSDv90=";
         };
         patches = [ ];
+        nativeCheckInputs =
+          old.nativeCheckInputs
+          ++ (with self; [
+            trove-classifiers
+          ]);
+        disabledTests = old.disabledTests ++ [
+          # relies on git
+          "test_package_with_include"
+          # Nix changes timestamp
+          "test_dist_info_date_time_default_value"
+          "test_sdist_members_mtime_default"
+          "test_sdist_mtime_zero"
+        ];
       });
     }
     // (plugins self);
diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix
index 335d2ba8089d..ba26b7d54be0 100644
--- a/pkgs/by-name/po/poetry/unwrapped.nix
+++ b/pkgs/by-name/po/poetry/unwrapped.nix
@@ -4,21 +4,19 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+  fetchpatch2,
   installShellFiles,
   build,
   cachecontrol,
   cleo,
-  crashtest,
   dulwich,
   fastjsonschema,
   installer,
   keyring,
   packaging,
-  pexpect,
   pkginfo,
   platformdirs,
   poetry-core,
-  poetry-plugin-export,
   pyproject-hooks,
   requests,
   requests-toolbelt,
@@ -39,18 +37,26 @@
 
 buildPythonPackage rec {
   pname = "poetry";
-  version = "1.8.5";
+  version = "2.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = "poetry";
-    rev = "refs/tags/${version}";
-    hash = "sha256-YR0IgDhmpbe8TyTMP1cjUxGRnrfV8CNHkPlZrNcnof0=";
+    tag = version;
+    hash = "sha256-r4TK4CKDfCeCW+Y1vUoS4ppXmn5xEvI1ZBVUHqFJLKo=";
   };
 
+  patches = [
+    # https://github.com/python-poetry/poetry/pull/9939
+    (fetchpatch2 {
+      url = "https://github.com/python-poetry/poetry/commit/89c0d02761229a8aa7ac5afcbc8935387bde4c5b.patch?full_index=1";
+      hash = "sha256-YuAevkmCSTGuFPfuKrJfcLUye1YGpnHSb9TFSW7F1SU=";
+    })
+  ];
+
   build-system = [
     poetry-core
   ];
@@ -70,17 +76,14 @@ buildPythonPackage rec {
       build
       cachecontrol
       cleo
-      crashtest
       dulwich
       fastjsonschema
       installer
       keyring
       packaging
-      pexpect
       pkginfo
       platformdirs
       poetry-core
-      poetry-plugin-export
       pyproject-hooks
       requests
       requests-toolbelt
@@ -136,8 +139,8 @@ buildPythonPackage rec {
   disabledTests = [
     "test_builder_should_execute_build_scripts"
     "test_env_system_packages_are_relative_to_lib"
-    "test_executor_known_hashes"
     "test_install_warning_corrupt_root"
+    "test_project_plugins_are_installed_in_project_folder"
   ];
 
   pytestFlagsArray = [