summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-12-12 21:48:44 +0100
committerlassulus <lass@aidsballs.de>2016-12-12 21:48:44 +0100
commitb6668a3f0c9fad22ab9f50ccd644df2dfe6af886 (patch)
tree92b5985611f887f38a2ff3d2d97e9718c229a8ca /makefu
parentf2f62193907e400dd59046f5fb47858f685aa465 (diff)
parentbc2b56baaf67623bed232b321607da8c25bbdaec (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu')
-rw-r--r--makefu/2configs/default.nix3
-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
4 files changed, 24 insertions, 4 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index db69be2fa..9a2adbc3e 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -22,8 +22,7 @@ with import <stockholm/lib>;
user = config.krebs.users.makefu;
source = let
inherit (config.krebs.build) host user;
- # ref = "b8ede35"; # stable @ 2016-10-19
- ref = "31c72ce"; # stable @ 2016-10-21 (dirtycow)
+ ref = "f52eaf4"; # stable @ 2016-12-12
in {
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
{
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";
}