2 files changed, 60 insertions, 10 deletions
diff --git a/makefu/5pkgs/python-firetv/default.nix b/makefu/5pkgs/python-firetv/default.nix
new file mode 100644
index 00000000..1fb772f1
--- /dev/null
+++ b/makefu/5pkgs/python-firetv/default.nix
@@ -0,0 +1,40 @@
+{ lib, pkgs, python2Packages, ... }:
+# requires libusb1 from unstable
+with (import <nixpkgs-unstable> {}).python2Packages; let
+
+ python-adb = buildPythonPackage rec {
+    pname = "adb";
+    version = "1.2.0";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0v4my47ikgkbq04gdllpx6kql5cfh7dnpq2fk72x03z74mqri7v8";
+    };
+
+    propagatedBuildInputs = [ libusb1 m2crypto ];
+    meta = {
+      homepage = https://github.com/google/python-adb;
+      description = "Python ADB + Fastboot implementation";
+      license = lib.licenses.asl20;
+    };
+  };
+in
+ buildPythonPackage rec {
+  name = "python-firetv-${version}";
+  version = "1.0.5";
+
+  src = pkgs.fetchFromGitHub {
+    owner = "happyleavesaoc";
+    repo = "python-firetv";
+    # rev = version;
+    rev = "55406c6";
+    sha256 = "1r2yighilchs0jvcvbngkjxkk7gp588ikcl64x7afqzxc6zxv7wp";
+  };
+
+  propagatedBuildInputs = [ python-adb flask pyyaml ];
+  meta = {
+    homepage = https://github.com/happyleavesaoc/python-firetv;
+    description = "provides state informations and some control of an amazon firetv";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/makefu/source.nix b/makefu/source.nix
index 79a2c535..474f7e15 100644
--- a/makefu/source.nix
+++ b/makefu/source.nix
@@ -1,12 +1,13 @@
 with import <stockholm/lib>;
 host@{ name,
-  override ? {},
-  secure ? false,
-  full ? false,
-  torrent ? false,
-  hw ? false,
-  musnix ? false,
-  python ? false
+  override ? {}
+,  secure ? false
+,  full ? false
+,  torrent ? false
+,  hw ? false
+,  musnix ? false
+,  python ? false
+,  unstable ? false #unstable channel checked out
 }:
 let
   builder = if getEnv "dummy_secrets" == "true"
@@ -19,7 +20,7 @@ let
     ];
   };
   # TODO: automate updating of this ref + cherry-picks
-  ref = "51810e0"; # nixos-17.09 @ 2018-02-14
+  ref = "6b6e72b"; # nixos-17.09 @ 2018-03-07
                    # + do_sqlite3 ruby: 55a952be5b5
                    # + signal: 0f19beef3
 
@@ -59,21 +60,30 @@ in
     (mkIf ( hw ) {
       nixos-hardware.git = {
         url = https://github.com/nixos/nixos-hardware.git;
-        ref = "8a05dc9";
+        ref = "30fdd53";
       };
     })
 
     (mkIf ( python ) {
       python.git = {
         url = https://github.com/garbas/nixpkgs-python;
-        ref = "cac319b";
+        ref = "cac319b7";
       };
     })
+
     (mkIf ( torrent ) {
       torrent-secrets.file = getAttr builder {
         buildbot = toString <stockholm/makefu/6tests/data/secrets>;
         makefu = "/home/makefu/secrets/torrent" ;
       };
     })
+
+    (mkIf ( unstable ) {
+      nixpkgs-unstable.git = {
+        url = https://github.com/nixos/nixpkgs-channels;
+        ref = "nixos-unstable";
+      };
+    })
+
     override
   ]