public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7138 from spwhitt/s3cmd

Browse Source 
s3cmd: 1.0.1 -> 1.5.2 and remove git version
This commit is contained in:
Austin Seipp 2015-04-03 04:07:25 -05:00
commit 52b71fc13b
3 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/tools/networking/s3cmd/default.nix
View File

@ -1,23 +1,20 @@
{ stdenv, fetchurl, pythonPackages }: { stdenv, fetchurl, pythonPackages }:
stdenv.mkDerivation rec { pythonPackages.buildPythonPackage rec {
name = "s3cmd-1.0.1"; name = "s3cmd-1.5.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/s3tools/${name}.tar.gz"; url = "mirror://sourceforge/s3tools/${name}.tar.gz";
sha256 = "1kmxhilwix5plv3qb49as6jknll3pq5abw948h28jisskkm2cs6p"; sha256 = "0bdl2wvh4nri4n6hpaa8s9lk98xy4a1b0l9ym54fvmxxx1j6g2pz";
}; };
buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; propagatedBuildInputs = with pythonPackages; [ python_magic dateutil ];
installPhase = meta = with stdenv.lib; {
''
python setup.py install --prefix=$out
wrapPythonPrograms
'';
meta = {
homepage = http://s3tools.org/; homepage = http://s3tools.org/;
description = "A command-line tool to manipulate Amazon S3 buckets"; description = "A command-line tool to manipulate Amazon S3 buckets";
license = licenses.gpl2;
maintainers = [ maintainers.spwhitt ];
platforms = platforms.all;
}; };
} }

19
pkgs/tools/networking/s3cmd/git.nix
View File

@ -1,19 +0,0 @@
{ stdenv, fetchgit, pythonPackages }:
pythonPackages.buildPythonPackage rec {
name = "s3cmd-1.5-pre-81e3842f7a";
src = fetchgit {
url = "https://github.com/s3tools/s3cmd.git";
rev = "81e3842f7afbc8c629f408f4d7dc22058f7bd536";
sha256 = "13jqw19ws5my8r856j1p7xydwpyp8agnzxkjv6pa7h72wl7rz90i";
};
propagatedBuildInputs = with pythonPackages; [ dateutil ];
meta = with stdenv.lib; {
description = "Command line tool for managing Amazon S3 and CloudFront services";
homepage = http://s3tools.org/s3cmd;
license = licenses.gpl2;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -2611,8 +2611,6 @@ let
s3cmd = callPackage ../tools/networking/s3cmd { }; s3cmd = callPackage ../tools/networking/s3cmd { };
s3cmd_15_pre_81e3842f7a = lowPrio (callPackage ../tools/networking/s3cmd/git.nix { });
s3sync = callPackage ../tools/networking/s3sync { s3sync = callPackage ../tools/networking/s3sync {
ruby = ruby_1_8; ruby = ruby_1_8;
}; };