diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2020-04-09 11:51:45 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-09 11:51:45 -0500 |
commit | c11dd7afad8be8778089f5e27b31ec001c4c70e9 (patch) | |
tree | fafd16aca30576c8249f76ccc42aa95c675b12da /pkgs | |
parent | 74bedf27a96e6d3224891cbc3c0b4e58f22200b0 (diff) | |
parent | d20690b0d039b4fad03b0a682b7454a48bc2d0f7 (diff) | |
download | nixlib-c11dd7afad8be8778089f5e27b31ec001c4c70e9.tar nixlib-c11dd7afad8be8778089f5e27b31ec001c4c70e9.tar.gz nixlib-c11dd7afad8be8778089f5e27b31ec001c4c70e9.tar.bz2 nixlib-c11dd7afad8be8778089f5e27b31ec001c4c70e9.tar.lz nixlib-c11dd7afad8be8778089f5e27b31ec001c4c70e9.tar.xz nixlib-c11dd7afad8be8778089f5e27b31ec001c4c70e9.tar.zst nixlib-c11dd7afad8be8778089f5e27b31ec001c4c70e9.zip |
Merge pull request #84784 from r-ryantm/auto-update/s3cmd
s3cmd: 2.0.2 -> 2.1.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/networking/s3cmd/default.nix | 25 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 31b111f2b83d..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.0.2"; - + version = "2.1.0"; + src = fetchFromGitHub { - owner = "s3tools"; - repo = "s3cmd"; - rev = "v${version}"; - sha256 = "0ninw830309cxga99gjnfghpkywf9kd6yz4wqsq85zni1dv39cdk"; + 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 f4e0ca730692..10d1171b7e16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6359,7 +6359,7 @@ in s3fs = callPackage ../tools/filesystems/s3fs { }; - s3cmd = callPackage ../tools/networking/s3cmd { }; + s3cmd = python3Packages.callPackage ../tools/networking/s3cmd { }; s4cmd = callPackage ../tools/networking/s4cmd { }; |