Merge branch 'master' into staging-next

Conflicts:
  pkgs/servers/x11/xorg/default.nix

pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix

@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "aio-geojson-geonetnz-quakes";
-  version = "0.12";
+  version = "0.13";
 
   src = fetchFromGitHub {
     owner = "exxamalte";
     repo = "python-aio-geojson-geonetnz-quakes";
     rev = "v${version}";
-    sha256 = "166gvcc1rzigb822k1373y18k54x5aklikr8sc7hyml5vz937xr7";
+    sha256 = "sha256-M1QleYVPqLFjxBmOlNJdydxDTk0JJf+GYVtOTC3YUTA=";
   };
 
   propagatedBuildInputs = [

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

@@ -8,6 +8,8 @@
 , typing-extensions
 , curio
 , hypothesis
+, mock
+, pytest-mock
 , pytestCheckHook
 , trio
 , trustme
@@ -16,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "anyio";
-  version = "2.2.0";
+  version = "3.1.0";
   format = "pyproject";
   disabled = pythonOlder "3.7";
 
@@ -24,7 +26,7 @@ buildPythonPackage rec {
     owner = "agronholm";
     repo = pname;
     rev = version;
-    sha256 = "0ram1niv2lg9qj53zssph104a4kxl8f94ilfn6mibn034m3ikcc8";
+    sha256 = "sha256-zQiSAQN7cp1s+8hDTvYaMkHUXV1ccNwIsl2IOztH7J8=";
   };
 
   propagatedBuildInputs = [
@@ -37,18 +39,21 @@ buildPythonPackage rec {
   checkInputs = [
     curio
     hypothesis
+    pytest-mock
     pytestCheckHook
     trio
     trustme
     uvloop
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    mock
   ];
 
-  pytestFlagsArray = [
-    # lots of DNS lookups
-    "--ignore=tests/test_sockets.py"
+  disabledTestPaths = [
+     # lots of DNS lookups
+    "tests/test_sockets.py"
   ] ++ lib.optionals stdenv.isDarwin [
     # darwin sandboxing limitations
-    "--ignore=tests/streams/test_tls.py"
+    "tests/streams/test_tls.py"
   ];
 
   pythonImportsCheck = [ "anyio" ];

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

@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchFromGitHub, pythonOlder
 , aria2, poetry, pytest, pytestcov, pytest_xdist, responses
-, asciimatics, loguru, requests, setuptools, websocket_client
+, asciimatics, loguru, requests, setuptools, websocket-client
 }:
 
 buildPythonPackage rec {
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     pytest -nauto -k "not test_api and not test_cli and not test_interface"
   '';
 
-  propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket_client ];
+  propagatedBuildInputs = [ asciimatics loguru requests setuptools websocket-client ];
 
   meta = with lib; {
     homepage = "https://github.com/pawamoy/aria2p";

pkgs/development/python-modules/azure-eventhub/default.nix

@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, azure-core
+, uamqp
+}:
+
+buildPythonPackage rec {
+  pname = "azure-eventhub";
+  version = "5.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "7b757b4910ac74902564b38089b9861c1bc51ff15bd49ff056888f939f7c4c49";
+  };
+
+  propagatedBuildInputs = [
+    azure-core
+    uamqp
+  ];
+
+  # too complicated to set up
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "azure.eventhub"
+    "azure.eventhub.aio"
+  ];
+
+  meta = with lib; {
+    description = "Microsoft Azure Event Hubs Client Library for Python";
+    homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/eventhub/azure-eventhub";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

pkgs/development/python-modules/backports-zoneinfo/default.nix

@@ -1,6 +1,9 @@
 { lib, buildPythonPackage, fetchFromGitHub
 , pythonOlder
+, python
+, substituteAll
 , importlib-resources
+, tzdata
 , hypothesis
 , pytestCheckHook
 }:
@@ -16,7 +19,17 @@ buildPythonPackage rec {
     sha256 = "sha256-00xdDOVdDanfsjQTd3yjMN2RFGel4cWRrAA3CvSnl24=";
   };
 
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [
+  patches = [
+    (substituteAll {
+      name = "zoneinfo-path";
+      src = ./zoneinfo.patch;
+      zoneinfo = "${tzdata}/lib/${python.libPrefix}/site-packages/tzdata/zoneinfo";
+    })
+  ];
+
+  propagatedBuildInputs = [
+    tzdata
+  ] ++ lib.optionals (pythonOlder "3.7") [
     importlib-resources
   ];
 
@@ -27,8 +40,14 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  # unfortunately /etc/zoneinfo doesn't exist in sandbox, and many tests fail
-  doCheck = false;
+  disabledTests = [
+    # AssertionError: 'AEDT' != 'AEST'
+    "test_folds_and_gaps"
+    # AssertionError: 0 != 1 : (datetime.datetime(1917, 3, 25, 2, 0, 1, tzinfo=backports.zoneinfo.ZoneInfo(key='Australia/Sydney')), datetime.datetime(1917, 3, 24, 15, 0, tzinfo=datetime.timezone.utc))
+    "test_folds_from_utc"
+    # backports.zoneinfo._common.ZoneInfoNotFoundError: 'No time zone found with key Eurasia/Badzone'
+    "test_bad_keys"
+  ];
 
   meta = with lib; {
     description = "Backport of the standard library module zoneinfo";

pkgs/development/python-modules/backports-zoneinfo/zoneinfo.patch

@@ -0,0 +1,17 @@
+diff --git a/src/backports/zoneinfo/_tzpath.py b/src/backports/zoneinfo/_tzpath.py
+index 9baaf6b..3f842af 100644
+--- a/src/backports/zoneinfo/_tzpath.py
++++ b/src/backports/zoneinfo/_tzpath.py
+@@ -24,10 +24,7 @@ def reset_tzpath(to=None):
+             base_tzpath = _parse_python_tzpath(env_var)
+         elif sys.platform != "win32":
+             base_tzpath = [
+-                "/usr/share/zoneinfo",
+-                "/usr/lib/zoneinfo",
+-                "/usr/share/lib/zoneinfo",
+-                "/etc/zoneinfo",
++                "@zoneinfo@"
+             ]
+ 
+             base_tzpath.sort(key=lambda x: not os.path.exists(x))
+

pkgs/development/python-modules/blebox-uniapi/default.nix

@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, aiohttp
+, semver
+, asynctest
+, deepmerge
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "blebox-uniapi";
+  version = "1.3.3";
+
+  src = fetchFromGitHub {
+    owner = "blebox";
+    repo = "blebox_uniapi";
+    rev = "v${version}";
+    sha256 = "0qvv2697yhqjmgvh37h8wgz3a77n61kqmxvsk4pf47wn43hks15c";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "pytest-runner" ""
+  '';
+
+  propagatedBuildInputs = [
+    aiohttp
+    semver
+  ];
+
+  checkInputs = [
+    asynctest
+    deepmerge
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "blebox_uniapi" ];
+
+  meta = with lib; {
+    description = "Python API for accessing BleBox smart home devices";
+    homepage = "https://github.com/blebox/blebox_uniapi";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

pkgs/development/python-modules/bond-api/default.nix

@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, aiohttp
+, aioresponses
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "bond-api";
+  version = "0.1.12";
+
+  src = fetchFromGitHub {
+    owner = "prystupa";
+    repo = "bond-api";
+    rev = "v${version}";
+    sha256 = "0zqaqqadr4x4vmq28nfk5x67gfwqqfy19z0cgrpxlbbvxamccym0";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+  ];
+
+  checkInputs = [
+    aioresponses
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "bond_api" ];
+
+  meta = with lib; {
+    description = "Asynchronous Python wrapper library over Bond Local API";
+    homepage = "https://github.com/prystupa/bond-api";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

pkgs/development/python-modules/boost-histogram/default.nix

@@ -0,0 +1,26 @@
+{ lib, fetchPypi, buildPythonPackage, isPy3k, boost, numpy, pytestCheckHook, pytest-benchmark }:
+
+buildPythonPackage rec {
+  pname = "boost-histogram";
+  version = "1.0.2";
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    pname = "boost_histogram";
+    inherit version;
+    sha256 = "b79cb9a00c5b8e44ff24ffcbec0ce5d3048dd1570c8592066344b6d2f2369fa2";
+  };
+
+  buildInputs = [ boost ];
+  propagatedBuildInputs = [ numpy ];
+
+  checkInputs = [ pytestCheckHook pytest-benchmark ];
+
+  meta = with lib; {
+    description = "Python bindings for the C++14 Boost::Histogram library";
+    homepage = "https://github.com/scikit-hep/boost-histogram";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ veprbl ];
+  };
+}

pkgs/development/python-modules/devolo-home-control-api/default.nix

@@ -6,7 +6,7 @@
 , pytestCheckHook
 , pythonOlder
 , requests
-, websocket_client
+, websocket-client
 , zeroconf
 }:
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     requests
     zeroconf
-    websocket_client
+    websocket-client
   ];
 
   checkInputs = [

pkgs/development/python-modules/docker-py/default.nix

@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, six, requests, websocket_client, docker_pycreds }:
+{ lib, buildPythonPackage, fetchPypi, six, requests, websocket-client, docker_pycreds }:
 
 buildPythonPackage rec {
   version = "1.10.6";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     six
     requests
-    websocket_client
+    websocket-client
     docker_pycreds
   ];
 

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

@@ -9,7 +9,7 @@
 , pytestCheckHook
 , requests
 , six
-, websocket_client
+, websocket-client
 }:
 
 buildPythonPackage rec {
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     paramiko
     requests
     six
-    websocket_client
+    websocket-client
   ] ++ lib.optional isPy27 backports_ssl_match_hostname;
 
   checkInputs = [

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

@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, aiohttp
+, async-timeout
+, aioresponses
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "foobot-async";
+  version = "1.0.0";
+
+  disabled = pythonOlder "3.5";
+
+  src = fetchPypi {
+    pname = "foobot_async";
+    inherit version;
+    sha256 = "fa557a22de925139cb4a21034ffdbcd01d28bf166c0e680eaf84a99206327f40";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    async-timeout
+  ];
+
+  checkInputs = [
+    aioresponses
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "foobot_async" ];
+
+  meta = with lib; {
+    description = "API Client for Foobot Air Quality Monitoring devices";
+    homepage = "https://github.com/reefab/foobot_async";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

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

@@ -17,7 +17,7 @@
 , requests
 , requests_toolbelt
 , terminaltables
-, websocket_client
+, websocket-client
 }:
 
 buildPythonPackage rec {
@@ -55,7 +55,7 @@ buildPythonPackage rec {
     requests
     requests_toolbelt
     terminaltables
-    websocket_client
+    websocket-client
   ];
 
   # tries to use /homeless-shelter to mimic container usage, etc

pkgs/development/python-modules/graphql-subscription-manager/default.nix

@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, setuptools
+, websockets
+}:
+
+buildPythonPackage rec {
+  pname = "graphql-subscription-manager";
+  version = "0.4.0";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "Danielhiversen";
+    repo = "PyGraphqlWebsocketManager";
+    rev = version;
+    sha256 = "1176xzr9fa7gl5cm0pcv5lb45d2ms5awi601rjcr3a0a14a1i8fz";
+  };
+
+  propagatedBuildInputs = [
+    setuptools
+    websockets
+  ];
+
+  # no tests implemented
+  doCheck = false;
+
+  pythonImportsCheck = [ "graphql_subscription_manager" ];
+
+  meta = with lib; {
+    description = "Python3 library for graphql subscription manager";
+    homepage = "https://github.com/Danielhiversen/PyGraphqlWebsocketManager";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

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

@@ -0,0 +1,48 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, netifaces
+, pycryptodome
+, pytest-asyncio
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "greeclimate";
+  version = "0.11.8";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "cmroche";
+    repo = "greeclimate";
+    rev = version;
+    sha256 = "1n46klbhl0gpd5x995mrcr1qfd77hrfm501qns1zhvv0zk8mdsf4";
+  };
+
+  propagatedBuildInputs = [
+    netifaces
+    pycryptodome
+  ];
+
+  checkInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "greeclimate"
+    "greeclimate.device"
+    "greeclimate.discovery"
+    "greeclimate.exceptions"
+    "greeclimate.network"
+  ];
+
+  meta = with lib; {
+    description = "Discover, connect and control Gree based minisplit systems";
+    homepage = "https://github.com/cmroche/greeclimate";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

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

@@ -10,7 +10,7 @@
 , pytest-aiohttp
 , pytest-asyncio
 , requests
-, websocket_client
+, websocket-client
 , websockets
 }:
 
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     aiohttp
     async-timeout
     requests
-    websocket_client
+    websocket-client
     websockets
   ];
 

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

@@ -2,31 +2,33 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
+, anyio
 , h11
 , h2
 , pproxy
 , pytest-asyncio
-, pytest-trio
 , pytestCheckHook
 , pytestcov
 , sniffio
+, trio
 , trustme
 , uvicorn
 }:
 
 buildPythonPackage rec {
   pname = "httpcore";
-  version = "0.13.0";
+  version = "0.13.4";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "encode";
     repo = pname;
     rev = version;
-    sha256 = "sha256-KvqBVQUaF3p2oJz0tt3Bkn2JiKEHqrZ3b6I9f0JK5h8=";
+    sha256 = "0vfdkd3bq14mnjd2gfg3ajsgygmd796md7pv96nicpx20prw3a2p";
   };
 
   propagatedBuildInputs = [
+    anyio
     h11
     h2
     sniffio
@@ -35,16 +37,23 @@ buildPythonPackage rec {
   checkInputs = [
     pproxy
     pytest-asyncio
-    pytest-trio
     pytestCheckHook
     pytestcov
+    trio
     trustme
     uvicorn
   ];
 
+  postPatch = ''
+    # The anyio 3.1.0 release is not picked-up proberly
+    substituteInPlace setup.py --replace "anyio==3.*" "anyio"
+  '';
+
+
   disabledTestPaths = [
     # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known
     "tests/test_threadsafety.py"
+    "tests/async_tests/"
     "tests/sync_tests/test_interfaces.py"
     "tests/sync_tests/test_retries.py"
   ];

pkgs/development/python-modules/ibm-watson/default.nix

@@ -8,7 +8,7 @@
 , tox
 , requests
 , python-dateutil
-, websocket_client
+, websocket-client
 , ibm-cloud-sdk-core
 }:
 
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     requests
     python-dateutil
-    websocket_client
+    websocket-client
     ibm-cloud-sdk-core
   ];
 

pkgs/development/python-modules/jellyfin-apiclient-python/default.nix

@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi, requests
-, websocket_client, pythonOlder }:
+, websocket-client, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "jellyfin-apiclient-python";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "sha256-nSLUa9/jAT6XrHo77kV5HYBxPO/lhcWKqPfpES7ul9A=";
   };
 
-  propagatedBuildInputs = [ requests websocket_client ];
+  propagatedBuildInputs = [ requests websocket-client ];
 
   doCheck = false; # no tests
   pythonImportsCheck = [ "jellyfin_apiclient_python" ];

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

@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi, pythonAtLeast,
-  ipaddress, websocket_client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal,
+  ipaddress, websocket-client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal,
   isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }:
 
 buildPythonPackage rec {
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];
-  propagatedBuildInputs = [ ipaddress websocket_client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ];
+  propagatedBuildInputs = [ ipaddress websocket-client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ];
 
   meta = with lib; {
     description = "Kubernetes python client";

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

@@ -1,6 +1,6 @@
 { lib, fetchPypi, buildPythonPackage, hidapi
 , pycrypto, pillow, protobuf, future, ecpy, python-u2flib-host, pycryptodomex
-, websocket_client
+, websocket-client
 }:
 
 buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket_client
+    hidapi pycrypto pillow protobuf future ecpy python-u2flib-host pycryptodomex websocket-client
   ];
 
   # No tests

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

@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , enum-compat
 , requests
-, websocket_client
+, websocket-client
 , zeroconf
 , pytestCheckHook
 }:
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     requests
     enum-compat
-    websocket_client
+    websocket-client
     zeroconf
   ];
 

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

@@ -6,7 +6,7 @@
 , pytest-runner
 , pytestCheckHook
 , requests
-, websocket_client
+, websocket-client
 }:
 
 buildPythonPackage rec {

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

@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , requests
 , tqdm
-, websocket_client
+, websocket-client
 , isPy27
 }:
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     requests
     tqdm
-    websocket_client
+    websocket-client
   ];
 
   # Tests require a running Plex instance

pkgs/development/python-modules/praw/6.3.nix

@@ -9,7 +9,7 @@
 , pytest
 , requests-toolbelt
 , update_checker
-, websocket_client
+, websocket-client
 }:
 
 buildPythonPackage rec {
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     mock
     prawcore
     update_checker
-    websocket_client
+    websocket-client
   ];
 
   checkInputs = [

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

@@ -9,7 +9,7 @@
 , pytestCheckHook
 , requests-toolbelt
 , update_checker
-, websocket_client
+, websocket-client
 }:
 
 buildPythonPackage rec {
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     mock
     prawcore
     update_checker
-    websocket_client
+    websocket-client
   ];
 
   checkInputs = [

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

@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , requests
-, websocket_client
+, websocket-client
 , python_magic
 , cryptography
 , pytestCheckHook
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64";
   };
 
-  propagatedBuildInputs = [ cryptography requests websocket_client python_magic ];
+  propagatedBuildInputs = [ cryptography requests websocket-client python_magic ];
 
   preCheck = ''
     export PUSHBULLET_API_KEY=""

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

@@ -57,8 +57,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A cross-language development platform for in-memory data";
     homepage = "https://arrow.apache.org/";
-    license = lib.licenses.asl20;
+    license = licenses.asl20;
     platforms = platforms.unix;
-    maintainers = with lib.maintainers; [ veprbl ];
+    maintainers = with maintainers; [ veprbl ];
   };
 }

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

@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytz
+, oauthlib
+, requests
+, websocket-client
+}:
+
+buildPythonPackage rec {
+  pname = "pyfireservicerota";
+  version = "0.0.40";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "8d8173f6682ef2a61367660a15559c8c7a7e00db3f98092e0fa52e771df356f4";
+  };
+
+  propagatedBuildInputs = [
+    pytz
+    oauthlib
+    requests
+    websocket-client
+  ];
+
+  # no tests implemented
+  doCheck = false;
+
+  pythonImportsCheck = [ "pyfireservicerota" ];
+
+  meta = with lib; {
+    description = "Python 3 API wrapper for FireServiceRota/BrandweerRooster";
+    homepage = "https://github.com/cyberjunky/python-fireservicerota";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

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

@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, aiohttp
+, dateutil
+}:
+
+buildPythonPackage rec {
+  pname = "pyflick";
+  version = "0.0.2";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    pname = "PyFlick";
+    inherit version;
+    sha256 = "705c82d8caedfff19117c8859cc1b4f56e15ab8dbc0d64d63b79d8634007897f";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    dateutil
+  ];
+
+  # no tests implemented
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "pyflick"
+    "pyflick.authentication"
+  ];
+
+  meta = with lib; {
+    description = "Python API For Flick Electric in New Zealand";
+    homepage = "https://github.com/ZephireNZ/PyFlick";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

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

@@ -12,7 +12,7 @@
 , pygame
 , s2clientprotocol
 , six
-, websocket_client
+, websocket-client
 , sc2-headless
 }:
 
@@ -49,7 +49,7 @@ buildPythonPackage {
     pygame
     s2clientprotocol
     six
-    websocket_client
+    websocket-client
     sc2-headless
   ];
 

pkgs/development/python-modules/python-engineio/3.nix

@@ -10,7 +10,7 @@
 , requests
 , six
 , tornado
-, websocket_client
+, websocket-client
 , websockets
 , pytestCheckHook
 , pythonAtLeast
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     mock
     requests
     tornado
-    websocket_client
+    websocket-client
     websockets
     pytestCheckHook
   ];

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

@@ -9,7 +9,7 @@
 , requests
 , six
 , tornado
-, websocket_client
+, websocket-client
 , websockets
 , pytestCheckHook
 }:
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     mock
     requests
     tornado
-    websocket_client
+    websocket-client
     websockets
     pytestCheckHook
   ];

pkgs/development/python-modules/python-mpv-jsonipc/default.nix

@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchFromGitHub, requests
-, tqdm, websocket_client, pythonOlder }:
+, tqdm, websocket-client, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "python-mpv-jsonipc";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   # 'mpv-jsonipc' does not have any tests
   doCheck = false;
 
-  propagatedBuildInputs = [ requests tqdm websocket_client ];
+  propagatedBuildInputs = [ requests tqdm websocket-client ];
 
   pythonImportsCheck = [ "python_mpv_jsonipc" ];
 

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

@@ -0,0 +1,51 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, aiohttp
+, async-timeout
+, graphql-subscription-manager
+, python-dateutil
+, pytz
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pytibber";
+  version = "0.17.1";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "Danielhiversen";
+    repo = "pyTibber";
+    rev = version;
+    sha256 = "1zda9cvg6hy0n7sr2z71lkyl93n1gnzxrvf56lhz13pcsffshhdk";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    async-timeout
+    graphql-subscription-manager
+    python-dateutil
+    pytz
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [ "test/test.py" ];
+
+  # tests access network
+  doCheck = false;
+
+  pythonImportsCheck = [ "tibber" ];
+
+  meta = with lib; {
+    description = "A python3 library to communicate with Tibber";
+    homepage = "https://github.com/Danielhiversen/pyTibber";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

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

@@ -7,7 +7,7 @@
 , pythonOlder
 , requests
 , six
-, websocket_client
+, websocket-client
 }:
 
 buildPythonPackage rec {
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     ifaddr
     requests
     six
-    websocket_client
+    websocket-client
   ];
 
   patches = [

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

@@ -21,7 +21,7 @@
 , deepdiff
 , pytestCheckHook
 , pytestcov
-, websocket_client
+, websocket-client
 }:
 
 buildPythonPackage rec {
@@ -62,7 +62,7 @@ buildPythonPackage rec {
     deepdiff
     pytestCheckHook
     pytestcov
-    websocket_client
+    websocket-client
   ];
 
   disabledTests = [

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

@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchPypi
-, websocket_client
+, websocket-client
 }:
 
 buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    websocket_client
+    websocket-client
   ];
 
   # no tests

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

@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchPypi, isPy27
 , requests
-, websocket_client
+, websocket-client
 }:
 
 buildPythonPackage rec {
@@ -14,7 +14,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    websocket_client
+    websocket-client
     requests
   ];
 

pkgs/development/python-modules/slack-sdk/default.nix

@@ -15,7 +15,7 @@
 , pytestCheckHook
 , pytestrunner
 , sqlalchemy
-, websocket_client
+, websocket-client
 , websockets
 }:
 
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     aiohttp
     boto3
     sqlalchemy
-    websocket_client
+    websocket-client
     websockets
   ];
 

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

@@ -14,7 +14,7 @@
 , requests
 , responses
 , six
-, websocket_client
+, websocket-client
 }:
 
 buildPythonPackage rec {
@@ -32,7 +32,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     aiohttp
-    websocket_client
+    websocket-client
     requests
     six
   ];

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

@@ -48,6 +48,9 @@ buildPythonPackage rec {
     # test gets stuck in epoll_pwait on hydras aarch64 builders
     # https://github.com/MagicStack/uvloop/issues/412
     "--deselect" "tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data"
+  ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
+    # Flaky test: https://github.com/MagicStack/uvloop/issues/412
+    "--deselect" "tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set"
   ];
 
   disabledTestPaths = [

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

@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, requests
+, simplejson
+}:
+
+buildPythonPackage rec {
+  pname = "wallbox";
+  version = "0.4.5";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "cf1616d79cb0345849ceff1b89a7c80e26ae19b3c2d818def62d6975665838c1";
+  };
+
+  propagatedBuildInputs = [
+    requests
+    simplejson
+  ];
+
+  # no tests implemented
+  doCheck = false;
+
+  pythonImportsCheck = [ "wallbox" ];
+
+  meta = with lib; {
+    description = "Module for interacting with Wallbox EV charger api";
+    homepage = "https://github.com/cliviu74/wallbox";
+    license = licenses.mit;
+    maintainers = with maintainers; [ dotlambda ];
+  };
+}

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

@@ -6,7 +6,7 @@
 , pytest-runner
 , pytestCheckHook
 , requests
-, websocket_client
+, websocket-client
 }:
 
 buildPythonPackage rec {
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     click
     pytest-runner
     requests
-    websocket_client
+    websocket-client
   ];
 
   checkInputs = [

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

@@ -8,11 +8,12 @@
 }:
 
 buildPythonPackage rec {
-  pname = "websocket_client";
+  pname = "websocket-client";
   version = "0.58.0";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "websocket_client";
+    inherit version;
     sha256 = "sha256-Y1CbQdFYrlt/Z+tK0g/su07umUNOc+FANU3D/44JcW8=";
   };
 

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

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "wled";
-  version = "0.5.0";
+  version = "0.6.0";
   disabled = pythonOlder "3.8";
   format = "pyproject";
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "frenck";
     repo = "python-wled";
     rev = "v${version}";
-    sha256 = "123806fmdihdf9y8dqp5rli5c4i9a74j9rmhay8m68igm1326d5f";
+    sha256 = "sha256-aFBcSGPCT49TbqzjUv/d8agdPOCC090rNxDnE9y91Pk=";
   };
 
   nativeBuildInputs = [