Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 74bedf27a96e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c11dd7afad8b
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 9, 2020

  1. s3cmd: 2.0.2 -> 2.1.0

    @r-ryantm
    r-ryantm committed Apr 9, 2020
    Copy the full SHA
    9d9ea65 View commit details

  2. s3cmd: use python3

    @marsam
    marsam committed Apr 9, 2020
    Copy the full SHA
    d20690b View commit details

  3. Merge pull request #84784 from r-ryantm/auto-update/s3cmd 

    s3cmd: 2.0.2 -> 2.1.0
    @marsam
    marsam authored Apr 9, 2020
    Copy the full SHA
    c11dd7a View commit details
Showing with 14 additions and 13 deletions.
  1. +13 −12 pkgs/tools/networking/s3cmd/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
25 changes: 13 additions & 12 deletions pkgs/tools/networking/s3cmd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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 { };