summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-03-05 23:37:18 +0100
committermakefu <github@syntax-fehler.de>2018-03-05 23:37:18 +0100
commit0170701ee6dbcb13073e85d24bec4d67c7f73a28 (patch)
treeb7c1a995174e4a01936f216f0c74142f325127cc
parentca1d401aaf7bd760f262cfaea1e4fe42e0e17888 (diff)
ma pkgs.python-firetv: need to pin adb
-rw-r--r--makefu/5pkgs/python-firetv/default.nix17
1 files changed, 8 insertions, 9 deletions
diff --git a/makefu/5pkgs/python-firetv/default.nix b/makefu/5pkgs/python-firetv/default.nix
index 04c76ac55..1fb772f1f 100644
--- a/makefu/5pkgs/python-firetv/default.nix
+++ b/makefu/5pkgs/python-firetv/default.nix
@@ -3,21 +3,19 @@
with (import <nixpkgs-unstable> {}).python2Packages; let
python-adb = buildPythonPackage rec {
- name = "python-adb-${version}";
+ pname = "adb";
version = "1.2.0";
- src = pkgs.fetchFromGitHub {
- owner = "google";
- repo = "python-adb";
- rev = "28d912a";
- sha256 = "1cy18l96v72hrhf21im5i8hlzd8ilv0vcck026npnxiw095a5hm2";
+ 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.apache2;
+ license = lib.licenses.asl20;
};
};
in
@@ -28,8 +26,9 @@ in
src = pkgs.fetchFromGitHub {
owner = "happyleavesaoc";
repo = "python-firetv";
- rev = version;
- sha256 = "0j5p8jg13hc9gcbv0ipxgljrpcxk8b7k4p4kyfhmblpjm51mycs3";
+ # rev = version;
+ rev = "55406c6";
+ sha256 = "1r2yighilchs0jvcvbngkjxkk7gp588ikcl64x7afqzxc6zxv7wp";
};
propagatedBuildInputs = [ python-adb flask pyyaml ];