diff options
| author | Shea Levy <shea@shealevy.com> | 2014-06-17 09:56:01 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-06-17 09:56:01 -0400 |
| commit | fec288f4041c69956d4014e5b9371f553828fbd1 (patch) | |
| tree | 7b95b3d9eee5d1ac98db6e30ee70ebee3a661e28 /pkgs | |
| parent | 219e9925199e1435a7ed90e1c0a8a6fa17956253 (diff) | |
| parent | d7182bdf2bcd9d1863506d7d532dcd844764bc80 (diff) | |
| download | nixlib-fec288f4041c69956d4014e5b9371f553828fbd1.tar nixlib-fec288f4041c69956d4014e5b9371f553828fbd1.tar.gz nixlib-fec288f4041c69956d4014e5b9371f553828fbd1.tar.bz2 nixlib-fec288f4041c69956d4014e5b9371f553828fbd1.tar.lz nixlib-fec288f4041c69956d4014e5b9371f553828fbd1.tar.xz nixlib-fec288f4041c69956d4014e5b9371f553828fbd1.tar.zst nixlib-fec288f4041c69956d4014e5b9371f553828fbd1.zip | |
Merge branch 's3cmd-git' of git://github.com/fmapfmapfmap/nixpkgs
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/s3cmd/git.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/release-python.nix | 1 |
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..6193137c8d41 --- /dev/null +++ b/pkgs/tools/networking/s3cmd/git.nix @@ -0,0 +1,19 @@ +{ 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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3ba6a64df2f..025a4b1cf37f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1966,6 +1966,8 @@ let s3cmd = callPackage ../tools/networking/s3cmd { }; + s3cmd_15_pre_81e3842f7a = lowPrio (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; }; |