Merge remote-tracking branch 'upstream/master' into staging

Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix

1 files changed, 24 insertions, 0 deletions

diff --git a/pkgs/development/python-modules/websockets_client/default.nix b/pkgs/development/python-modules/websockets_client/default.nix
new file mode 100644
index 000000000000..dd6e9200db52
--- /dev/null
+++ b/pkgs/development/python-modules/websockets_client/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, six }:
+buildPythonPackage rec {
+  pname = "websocket_client";
+  version = "0.47.0";
+
+  src = fetchPypi {
+    inherit version pname;
+    sha256 = "0jb1446053ryp5p25wsr1hjfdzwfm04a6f3pzpcb63bfz96xqlx4";
+  };
+
+  prePatch = ''
+    # ssl.match_hostname exists in python2.7 version maintained in nixpkgs,
+    # the dependency is not necessary.
+    sed -e "s/\['backports.ssl_match_hostname'\]/\[\]/" -i setup.py
+  '';
+
+  propagatedBuildInputs = [ six ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/liris/websocket-client;
+    description = "Websocket client for python";
+    license = licenses.lgpl2;
+  };
+}