Merge pull request #7138 from spwhitt/s3cmd

s3cmd: 1.0.1 -> 1.5.2 and remove git version

pkgs/tools/networking/s3cmd/default.nix

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

pkgs/tools/networking/s3cmd/git.nix

@@ -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;
-  };
-}

pkgs/top-level/all-packages.nix

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