From 2c05eb96bccf6a160b9e2b5a473f161ee5a712cb Mon Sep 17 00:00:00 2001 From: vi Date: Mon, 2 Jun 2014 16:08:36 +0800 Subject: [PATCH 1/5] Supplementary derivation for s3cmd, building from git HEAD. --- pkgs/tools/networking/s3cmd/git.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/release-python.nix | 1 + 3 files changed, 22 insertions(+) create mode 100644 pkgs/tools/networking/s3cmd/git.nix diff --git a/pkgs/tools/networking/s3cmd/git.nix b/pkgs/tools/networking/s3cmd/git.nix new file mode 100644 index 00000000000..b6019c7eda1 --- /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 d25e33bd81f..fc7e4fcd67d 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 074f7ea4f7b..61d1ad7ad68 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; }; From db7be30172bd6ec9d46fb1c7dd26310e193ba937 Mon Sep 17 00:00:00 2001 From: vi Date: Mon, 2 Jun 2014 18:02:13 +0800 Subject: [PATCH 2/5] s3cmd-1.5-pre-81e3842f7a: Use more precise naming convention. --- pkgs/tools/networking/s3cmd/git.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/s3cmd/git.nix b/pkgs/tools/networking/s3cmd/git.nix index b6019c7eda1..6193137c8d4 100644 --- a/pkgs/tools/networking/s3cmd/git.nix +++ b/pkgs/tools/networking/s3cmd/git.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "s3cmd_git"; + name = "s3cmd-1.5-pre-81e3842f7a"; src = fetchgit { url = "https://github.com/s3tools/s3cmd.git"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc7e4fcd67d..13cf41ade4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1962,7 +1962,7 @@ let s3cmd = callPackage ../tools/networking/s3cmd { }; - s3cmd_git = callPackage ../tools/networking/s3cmd/git.nix { }; + s3cmd_15_pre_81e3842f7a = callPackage ../tools/networking/s3cmd/git.nix { }; s3sync = callPackage ../tools/networking/s3sync { ruby = ruby18; From 01211ff333a8554a45fbf3147a6ac4e550523a59 Mon Sep 17 00:00:00 2001 From: vi Date: Mon, 2 Jun 2014 18:02:56 +0800 Subject: [PATCH 3/5] s3cmd-1.5-pre-81e3842f7a: Use buildInputs, not propagatedBuildInputs. --- pkgs/tools/networking/s3cmd/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/s3cmd/git.nix b/pkgs/tools/networking/s3cmd/git.nix index 6193137c8d4..a7d43a470f8 100644 --- a/pkgs/tools/networking/s3cmd/git.nix +++ b/pkgs/tools/networking/s3cmd/git.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec { sha256 = "13jqw19ws5my8r856j1p7xydwpyp8agnzxkjv6pa7h72wl7rz90i"; }; - propagatedBuildInputs = with pythonPackages; [ dateutil ]; + buildInputs = with pythonPackages; [ dateutil ]; meta = with stdenv.lib; { description = "Command line tool for managing Amazon S3 and CloudFront services"; From f42961daadf64a67a91c6d2d2a3b01dc428ba66c Mon Sep 17 00:00:00 2001 From: vi Date: Mon, 2 Jun 2014 18:04:24 +0800 Subject: [PATCH 4/5] Mark s3cmd-1.5-pre-81e3842f7a as low priority. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13cf41ade4d..eeee0fcb038 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1962,7 +1962,7 @@ let s3cmd = callPackage ../tools/networking/s3cmd { }; - s3cmd_15_pre_81e3842f7a = callPackage ../tools/networking/s3cmd/git.nix { }; + s3cmd_15_pre_81e3842f7a = lowPrio (callPackage ../tools/networking/s3cmd/git.nix { }); s3sync = callPackage ../tools/networking/s3sync { ruby = ruby18; From d7182bdf2bcd9d1863506d7d532dcd844764bc80 Mon Sep 17 00:00:00 2001 From: vi Date: Tue, 3 Jun 2014 11:55:10 +0800 Subject: [PATCH 5/5] Revert "s3cmd-1.5-pre-81e3842f7a: Use buildInputs, not propagatedBuildInputs." This reverts commit 01211ff333a8554a45fbf3147a6ac4e550523a59. --- pkgs/tools/networking/s3cmd/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/s3cmd/git.nix b/pkgs/tools/networking/s3cmd/git.nix index a7d43a470f8..6193137c8d4 100644 --- a/pkgs/tools/networking/s3cmd/git.nix +++ b/pkgs/tools/networking/s3cmd/git.nix @@ -9,7 +9,7 @@ pythonPackages.buildPythonPackage rec { sha256 = "13jqw19ws5my8r856j1p7xydwpyp8agnzxkjv6pa7h72wl7rz90i"; }; - buildInputs = with pythonPackages; [ dateutil ]; + propagatedBuildInputs = with pythonPackages; [ dateutil ]; meta = with stdenv.lib; { description = "Command line tool for managing Amazon S3 and CloudFront services";