Merge branch 'master' into staging

pkgs/development/python-modules/dmenu/default.nix

@@ -0,0 +1,24 @@
+{ buildPythonPackage, lib, fetchPypi, dmenu }:
+
+buildPythonPackage rec {
+  pname = "dmenu-python";
+  version = "0.2.1";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "dmenu";
+    sha256 = "06v2fq0ciallbib7sbk4kncj0n3gdqp1kz8n5k2669x49wyh34wm";
+  };
+
+  propagatedBuildInputs = [ dmenu ];
+
+  # No tests existing
+  doCheck = false;
+
+  meta = {
+    description = "A Python wrapper for dmenu";
+    homepage = http://dmenu.readthedocs.io;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.nico202 ];
+  };
+}

pkgs/development/python-modules/raven/default.nix

@@ -1,12 +1,16 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, contextlib2, blinker }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
+, contextlib2, blinker
+}:
 
 buildPythonPackage rec {
   pname = "raven";
-  version = "6.5.0";
+  version = "6.6.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "84da75114739191bdf2388f296ffd6177e83567a7fbaf2701e034ad6026e4f3b";
+  src = fetchFromGitHub {
+    owner = "getsentry";
+    repo = "raven-python";
+    rev = version;
+    sha256 = "184wpr0zdcm260pxqll9kpmp2ywisn75k8pdm8gc6xmk740in1hj";
   };
 
   # way too many dependencies to run tests

pkgs/development/python-modules/trezor/default.nix

@@ -1,5 +1,5 @@
-{ lib, fetchPypi, buildPythonPackage, protobuf, hidapi, ecdsa, mnemonic
-, requests
+{ lib, fetchPypi, buildPythonPackage,
+  protobuf, hidapi, ecdsa, mnemonic, requests, pyblake2, click, libusb1
 }:
 
 buildPythonPackage rec {
@@ -12,9 +12,7 @@ buildPythonPackage rec {
     sha256 = "2dd01e11d669cb8f5e40fcf1748bcabc41fb5f41edb010fc807dc3088f9bd7de";
   };
 
-  propagatedBuildInputs = [ protobuf hidapi requests mnemonic ];
-
-  buildInputs = [ ecdsa ];
+  propagatedBuildInputs = [ protobuf hidapi ecdsa mnemonic requests pyblake2 click libusb1 ];
 
   # There are no actual tests: "ImportError: No module named tests"
   doCheck = false;