From 9d9ea65c5dc86be093eb0ad0fbbc900ef4bd8c5f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2020 08:03:25 +0000
Subject: [PATCH 1/2] s3cmd: 2.0.2 -> 2.1.0

---
 pkgs/tools/networking/s3cmd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix
index 31b111f2b83d..873e36e28b47 100644
--- a/pkgs/tools/networking/s3cmd/default.nix
+++ b/pkgs/tools/networking/s3cmd/default.nix
@@ -2,19 +2,19 @@
 
 python2Packages.buildPythonApplication rec {
   pname = "s3cmd";
-  version = "2.0.2";
+  version = "2.1.0";
   
   src = fetchFromGitHub {
     owner  = "s3tools";
     repo   = "s3cmd";
     rev    = "v${version}";
-    sha256 = "0ninw830309cxga99gjnfghpkywf9kd6yz4wqsq85zni1dv39cdk";
+    sha256 = "0p6mbgai7f0c12pkw4s7d649gj1f8hywj60pscxvj9jsna3iifhs";
   };
 
   propagatedBuildInputs = with python2Packages; [ python_magic dateutil ];
 
   meta = with stdenv.lib; {
-    homepage = http://s3tools.org/;
+    homepage = "http://s3tools.org/";
     description = "A command-line tool to manipulate Amazon S3 buckets";
     license = licenses.gpl2;
     maintainers = [ maintainers.spwhitt ];

From d20690b0d039b4fad03b0a682b7454a48bc2d0f7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 9 Apr 2020 04:20:00 -0500
Subject: [PATCH 2/2] s3cmd: use python3

---
 pkgs/tools/networking/s3cmd/default.nix | 21 +++++++++++----------
 pkgs/top-level/all-packages.nix         |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix
index 873e36e28b47..53f24ddb7524 100644
--- a/pkgs/tools/networking/s3cmd/default.nix
+++ b/pkgs/tools/networking/s3cmd/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchFromGitHub, python2Packages }:
+{ stdenv, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }:
 
-python2Packages.buildPythonApplication rec {
+buildPythonApplication rec {
   pname = "s3cmd";
   version = "2.1.0";
-  
+
   src = fetchFromGitHub {
-    owner  = "s3tools";
-    repo   = "s3cmd";
-    rev    = "v${version}";
+    owner = "s3tools";
+    repo = "s3cmd";
+    rev = "v${version}";
     sha256 = "0p6mbgai7f0c12pkw4s7d649gj1f8hywj60pscxvj9jsna3iifhs";
   };
 
-  propagatedBuildInputs = with python2Packages; [ python_magic dateutil ];
+  propagatedBuildInputs = [ python_magic dateutil ];
+
+  dontUseSetuptoolsCheck = true;
 
   meta = with stdenv.lib; {
-    homepage = "http://s3tools.org/";
-    description = "A command-line tool to manipulate Amazon S3 buckets";
+    homepage = "https://s3tools.org/s3cmd";
+    description = "Command line tool for managing Amazon S3 and CloudFront services";
     license = licenses.gpl2;
     maintainers = [ maintainers.spwhitt ];
-    platforms = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 064ff0724d03..c610d8ac81ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6360,7 +6360,7 @@ in
 
   s3fs = callPackage ../tools/filesystems/s3fs { };
 
-  s3cmd = callPackage ../tools/networking/s3cmd { };
+  s3cmd = python3Packages.callPackage ../tools/networking/s3cmd { };
 
   s4cmd = callPackage ../tools/networking/s4cmd { };