Merge branch 's3cmd-git' of git://github.com/fmapfmapfmap/nixpkgs

pkgs/tools/networking/s3cmd/git.nix

···
+{ 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

···
 
   s3cmd = callPackage ../tools/networking/s3cmd { };
 
+  s3cmd_15_pre_81e3842f7a = lowPrio (callPackage ../tools/networking/s3cmd/git.nix { });
+
   s3sync = callPackage ../tools/networking/s3sync {
     ruby = ruby18;
   };

pkgs/top-level/release-python.nix

···
   rxvt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   rxvt_unicode = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   s3cmd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
+  s3cmd_git = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   sabnzbd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   sakura = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
   salut_a_toi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };