Merge master into staging

This is to cleanup the (re-)revert of merge to master.

pkgs/development/python-modules/jsonrpc-async/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, aiohttp, jsonrpc-base }:
+
+buildPythonPackage rec {
+  pname = "jsonrpc-async";
+  version = "0.6";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0f1p3qv56jn4sdyp8gzf915nya6vr0rn2pbzld9x23y9jdjmibzw";
+  };
+
+  propagatedBuildInputs = [ aiohttp jsonrpc-base ];
+
+  meta = with stdenv.lib; {
+    description = "A JSON-RPC client library for asyncio";
+    homepage = http://github.com/armills/jsonrpc-async;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}

pkgs/development/python-modules/jsonrpc-base/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "jsonrpc-base";
+  version = "1.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1dl55n54ha5kf4x6hap2p1k3s4qa4w7g791wp2656rjg2zxfgywk";
+  };
+
+  propagatedBuildInputs = [ ];
+
+  meta = with stdenv.lib; {
+    description = "A JSON-RPC client library base interface";
+    homepage = https://github.com/armills/jsonrpc-base;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}

pkgs/development/python-modules/jsonrpc-websocket/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, aiohttp, jsonrpc-base }:
+
+buildPythonPackage rec {
+  pname = "jsonrpc-websocket";
+  version = "0.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0cijqb8fvv9iq5ds9y5sj0gd6lapi90mgqvpkczp28fxz440ihq4";
+  };
+
+  propagatedBuildInputs = [ aiohttp jsonrpc-base ];
+
+  meta = with stdenv.lib; {
+    description = "A JSON-RPC websocket client library for asyncio";
+    homepage = https://github.com/armills/jsonrpc-websocket;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}

pkgs/development/python-modules/onkyo-eiscp/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, docopt, netifaces }:
+
+buildPythonPackage rec {
+  pname = "onkyo-eiscp";
+  version = "1.2.4";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qb5w2g2cnckq7psh92g1w3gf76437x1vwfhwnd247wshs5h7hxj";
+  };
+
+  propagatedBuildInputs = [ docopt netifaces ];
+
+  meta = with stdenv.lib; {
+    description = "Control Onkyo receivers over ethernet";
+    homepage = https://github.com/miracle2k/onkyo-eiscp;
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}

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

@@ -22,6 +22,7 @@ if !(pythonOlder "3.4") then null else buildPythonPackage rec {
 
   preCheck = ''
     export LC_ALL="en_US.UTF-8"
+    sed -i test_pathlib2.py -e "s@hasattr(pwd, 'getpwall')@False@"
   '';
 
   meta = {
@@ -29,4 +30,4 @@ if !(pythonOlder "3.4") then null else buildPythonPackage rec {
     homepage = https://pypi.python.org/pypi/pathlib2/;
     license = with lib.licenses; [ mit ];
   };
-}
+}

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

@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, requests }:
+
+buildPythonPackage rec {
+  pname = "pyunifi";
+  version = "2.13";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1dhbfzv5a29v763m0b9wsc4pvkdr979w7g4rz7ak8hsi4sx6b9dq";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  meta = with stdenv.lib; {
+    description = "API towards Ubiquity Networks UniFi controller";
+    homepage = https://github.com/finish06/unifi-api;
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}

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

@@ -0,0 +1,19 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  pname = "wakeonlan";
+  version = "1.0.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1snkyc6ph0bnypqs5yjw35mx3f9ij4808r5i06gl2vhn1rfzgyh1";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A small python module for wake on lan";
+    homepage = https://github.com/remcohaszing/pywakeonlan;
+    license = licenses.wtfpl;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}