From 2df9c484cae181dfa1b20058c57a132a136ac07f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 19 Jan 2025 21:18:56 +0100
Subject: [PATCH] python3Packages.twine: 5.1.1 -> 6.0.1

---
 .../python-modules/twine/default.nix          | 57 ++++++++-----------
 1 file changed, 24 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix
index 0542cd1c9fd5..84b64340af36 100644
--- a/pkgs/development/python-modules/twine/default.nix
+++ b/pkgs/development/python-modules/twine/default.nix
@@ -1,17 +1,18 @@
 {
   lib,
   buildPythonPackage,
-  fetchpatch2,
   fetchPypi,
   pythonOlder,
   importlib-metadata,
   keyring,
+  packaging,
   pkginfo,
   readme-renderer,
   requests,
   requests-toolbelt,
   rich,
   rfc3986,
+  setuptools,
   setuptools-scm,
   urllib3,
   build,
@@ -22,45 +23,35 @@
 
 buildPythonPackage rec {
   pname = "twine";
-  version = "5.1.1";
-  format = "pyproject";
-  disabled = pythonOlder "3.7";
+  version = "6.0.1";
+  pyproject = true;
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mqCCUTnAKzQ02RNUXHuEeiHINeEVl/UlWELUV9ojIts=";
+    hash = "sha256-NhWLCd9UBuHJwfuO2yT8K+OHcJRD5zdmibk4UxWC7ic=";
   };
 
-  patches = [
-    # pkginfo>=1.11 compatibility patches
-    # https://github.com/pypa/twine/pull/1123
-    (fetchpatch2 {
-      name = "pkginfo-1_11-compatibility-test.patch";
-      url = "https://github.com/pypa/twine/commit/a3206073b87a8e939cf699777882ebfaced689a0.patch";
-      hash = "sha256-gLN7gJsVng/LFfsrAHjJlqFZTu0wSdeBfnUN+UnLSFk=";
-    })
-    (fetchpatch2 {
-      name = "pkginfo-1_11-compatibility-source.patch";
-      url = "https://github.com/pypa/twine/commit/03e3795659b44f263f527b0467680b238c8fbacc.patch";
-      hash = "sha256-Ne9+G8hMVbklKtcZLiBw29Skz5VO5x2F7yu/KozKgN8=";
-    })
+  build-system = [
+    setuptools
+    setuptools-scm
   ];
 
-  nativeBuildInputs = [ setuptools-scm ];
-
-  pythonRelaxDeps = [ "pkginfo" ];
-
-  propagatedBuildInputs = [
-    importlib-metadata
-    keyring
-    pkginfo
-    readme-renderer
-    requests
-    requests-toolbelt
-    rfc3986
-    rich
-    urllib3
-  ];
+  dependencies =
+    [
+      keyring
+      packaging
+      pkginfo
+      readme-renderer
+      requests
+      requests-toolbelt
+      rfc3986
+      rich
+      urllib3
+    ]
+    ++ lib.optionals (pythonOlder "3.10") [
+      importlib-metadata
+    ];
 
   nativeCheckInputs = [
     build