From ca6501bddb205bc7083fd909e32cf42785c24066 Mon Sep 17 00:00:00 2001
From: klea <klea@iwnp.org>
Date: Sat, 18 Jul 2026 17:20:09 +0000
Subject: [PATCH 1/2] s3cmd: migrate to pyproject

---
 pkgs/by-name/s3/s3cmd/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/s3/s3cmd/package.nix b/pkgs/by-name/s3/s3cmd/package.nix
index 7e76de2f114d..42a0a9d2b3aa 100644
--- a/pkgs/by-name/s3/s3cmd/package.nix
+++ b/pkgs/by-name/s3/s3cmd/package.nix
@@ -4,23 +4,27 @@
   fetchFromGitHub,
 }:
 
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "s3cmd";
   version = "2.4.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "s3tools";
     repo = "s3cmd";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-cxwf6+9WFt3U7+JdKRgZxFElD+Dgf2P2VyejHVoiDJk=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  dependencies = with python3Packages; [
     python-magic
     python-dateutil
   ];
 
+  build-system = with python3Packages; [ setuptools ];
+
+  pythonImportsCheck = [ "S3" ];
+
   meta = {
     homepage = "https://s3tools.org/s3cmd";
     description = "Command line tool for managing Amazon S3 and CloudFront services";
@@ -28,4 +32,4 @@ python3Packages.buildPythonApplication rec {
     license = lib.licenses.gpl2Plus;
     maintainers = [ ];
   };
-}
+})

From cbe1c494fddc489d7b64bcd455104dee41b7a507 Mon Sep 17 00:00:00 2001
From: klea <klea@iwnp.org>
Date: Sat, 18 Jul 2026 17:42:11 +0000
Subject: [PATCH 2/2] s3cmd: Enable __structuredAttrs

---
 pkgs/by-name/s3/s3cmd/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/s3/s3cmd/package.nix b/pkgs/by-name/s3/s3cmd/package.nix
index 42a0a9d2b3aa..8e9b4f8cfcce 100644
--- a/pkgs/by-name/s3/s3cmd/package.nix
+++ b/pkgs/by-name/s3/s3cmd/package.nix
@@ -9,6 +9,8 @@ python3Packages.buildPythonApplication (finalAttrs: {
   version = "2.4.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "s3tools";
     repo = "s3cmd";