Merge remote-tracking branch 'gum/master'

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 = "f52eaf4"; # stable @ 2016-12-12
-          ref = "31c72ce"; # stable @ 2016-10-21 (dirtycow)
       in {
         nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
           {

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";
+  };
+}

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";};

makefu/5pkgs/tw-upload-plugin/default.nix

@@ -3,6 +3,6 @@
 pkgs.fetchFromGitHub {
   owner = "makefu";
   repo = "tw-upload-plugin";
-  rev = "a00aac";
+  rev = "621e5fbe";
-  sha256 = "0kazqs24kzjxqzr33kg1jbfx8xyvmrnrdxh6g27kgkgbl1d2qknh";
+  sha256 = "1wjy76s5mr6z772w6sr0dwqxaxn45c7ys4a5y2v55hxclr096dqg";
 }