summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-12-22 20:45:46 +0100
committertv <tv@krebsco.de>2016-12-22 20:45:46 +0100
commit47056b7fb434708f2ea1151317501ea95ebbf8d5 (patch)
tree458630612ec3db5bdf014318983eff1aa453d330 /makefu/5pkgs
parent11b9f250ad43db043f539d86699c981c81d74c0a (diff)
parentdeaef40bdfb1da44c7daf59d2a4b833cb7581730 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/5pkgs')
-rw-r--r--makefu/5pkgs/acdcli/default.nix20
-rw-r--r--makefu/5pkgs/default.nix1
-rw-r--r--makefu/5pkgs/tw-upload-plugin/default.nix4
3 files changed, 23 insertions, 2 deletions
diff --git a/makefu/5pkgs/acdcli/default.nix b/makefu/5pkgs/acdcli/default.nix
new file mode 100644
index 000000000..1621375e3
--- /dev/null
+++ b/makefu/5pkgs/acdcli/default.nix
@@ -0,0 +1,20 @@
+{ lib, pkgs, python3Packages, fetchurl, ... }:
+
+with python3Packages; buildPythonPackage rec {
+ name = "acdcli-${version}";
+ version = "0.3.2";
+ propagatedBuildInputs = [
+ dateutil colorama fusepy appdirs requests2 requests_toolbelt six
+ ];
+ src = fetchurl {
+ url = "mirror://pypi/a/acdcli/${name}.tar.gz";
+ sha256 = "1ak9xxpyb7n6iyalf2082jpimklakm0fgm7vsv7qcm8wy6vlq2cw";
+ };
+ doCheck = false; # ImportError: Failed to import test module: tests
+ postFixup = ''
+ mv $out/bin/.acd_cli.py-wrapped $out/bin/acd_cli.py
+ '';
+ meta = {
+ description = "communicate with amazon drive";
+ };
+}
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 8994b3856..b62f1efa2 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -5,6 +5,7 @@ let
in
{
nixpkgs.config.packageOverrides = rec {
+ acdcli = callPackage ./acdcli {};
alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
diff --git a/makefu/5pkgs/tw-upload-plugin/default.nix b/makefu/5pkgs/tw-upload-plugin/default.nix
index a68dc09dc..8bc675847 100644
--- a/makefu/5pkgs/tw-upload-plugin/default.nix
+++ b/makefu/5pkgs/tw-upload-plugin/default.nix
@@ -3,6 +3,6 @@
pkgs.fetchFromGitHub {
owner = "makefu";
repo = "tw-upload-plugin";
- rev = "a00aac";
- sha256 = "0kazqs24kzjxqzr33kg1jbfx8xyvmrnrdxh6g27kgkgbl1d2qknh";
+ rev = "621e5fbe";
+ sha256 = "1wjy76s5mr6z772w6sr0dwqxaxn45c7ys4a5y2v55hxclr096dqg";
}