summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/networking/s3cmd/git.nix19
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/release-python.nix1
3 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/tools/networking/s3cmd/git.nix b/pkgs/tools/networking/s3cmd/git.nix
new file mode 100644
index 000000000000..b6019c7eda12
--- /dev/null
+++ b/pkgs/tools/networking/s3cmd/git.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchgit, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "s3cmd_git";
+
+  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;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d25e33bd81fc..fc7e4fcd67d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1962,6 +1962,8 @@ let
 
   s3cmd = callPackage ../tools/networking/s3cmd { };
 
+  s3cmd_git = callPackage ../tools/networking/s3cmd/git.nix { };
+
   s3sync = callPackage ../tools/networking/s3sync {
     ruby = ruby18;
   };
diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix
index 074f7ea4f7b6..61d1ad7ad681 100644
--- a/pkgs/top-level/release-python.nix
+++ b/pkgs/top-level/release-python.nix
@@ -1521,6 +1521,7 @@ let
   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; };