From 7b4d273d3cf91498d0d6e90a4576317b136216fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 15 Jun 2021 13:12:45 +0200 Subject: [PATCH] pythonPackages: websocket_client -> websocket-client --- pkgs/applications/misc/octoprint/default.nix | 2 +- pkgs/applications/misc/ulauncher/default.nix | 2 +- .../networking/irc/weechat/scripts/wee-slack/default.nix | 2 +- pkgs/applications/networking/p2p/zeronet/default.nix | 2 +- pkgs/applications/video/streamlink/default.nix | 2 +- pkgs/applications/virtualization/docker-compose/default.nix | 4 ++-- pkgs/development/python-modules/aria2p/default.nix | 4 ++-- .../python-modules/devolo-home-control-api/default.nix | 4 ++-- pkgs/development/python-modules/docker-py/default.nix | 4 ++-- pkgs/development/python-modules/docker/default.nix | 4 ++-- pkgs/development/python-modules/gradient/default.nix | 4 ++-- pkgs/development/python-modules/homematicip/default.nix | 4 ++-- pkgs/development/python-modules/ibm-watson/default.nix | 4 ++-- .../python-modules/jellyfin-apiclient-python/default.nix | 4 ++-- pkgs/development/python-modules/kubernetes/default.nix | 4 ++-- pkgs/development/python-modules/ledgerblue/default.nix | 4 ++-- pkgs/development/python-modules/libsoundtouch/default.nix | 4 ++-- pkgs/development/python-modules/orvibo/default.nix | 2 +- pkgs/development/python-modules/plexapi/default.nix | 4 ++-- pkgs/development/python-modules/praw/6.3.nix | 4 ++-- pkgs/development/python-modules/praw/default.nix | 4 ++-- pkgs/development/python-modules/pushbullet/default.nix | 4 ++-- .../development/python-modules/pyfireservicerota/default.nix | 4 ++-- pkgs/development/python-modules/pysc2/default.nix | 4 ++-- pkgs/development/python-modules/python-engineio/3.nix | 4 ++-- pkgs/development/python-modules/python-engineio/default.nix | 4 ++-- .../python-modules/python-mpv-jsonipc/default.nix | 4 ++-- pkgs/development/python-modules/roonapi/default.nix | 4 ++-- pkgs/development/python-modules/runway-python/default.nix | 4 ++-- pkgs/development/python-modules/samsungctl/default.nix | 4 ++-- pkgs/development/python-modules/samsungtvws/default.nix | 4 ++-- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- pkgs/development/python-modules/slackclient/default.nix | 4 ++-- pkgs/development/python-modules/waterfurnace/default.nix | 4 ++-- .../{websocket_client => websocket-client}/default.nix | 5 +++-- pkgs/development/tools/mpfshell/default.nix | 2 +- pkgs/misc/vim-plugins/overrides.nix | 2 +- pkgs/servers/home-assistant/appdaemon.nix | 2 +- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/tools/admin/azure-cli/default.nix | 2 +- pkgs/tools/admin/azure-cli/python-packages.nix | 5 ++--- pkgs/tools/networking/dd-agent/5.nix | 2 +- pkgs/tools/virtualization/awsebcli/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 45 files changed, 76 insertions(+), 75 deletions(-) rename pkgs/development/python-modules/{websocket_client => websocket-client}/default.nix (88%) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index af42466d0ea..16937fa57b0 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -134,7 +134,7 @@ let tornado unidecode watchdog - websocket_client + websocket-client werkzeug wrapt zeroconf diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index ebfaaa1db51..6d9d9deefa2 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec { python-Levenshtein pyxdg requests - websocket_client + websocket-client ]; checkInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 698ee80edf6..aebe906659e 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { env = "${buildEnv { name = "wee-slack-env"; paths = with python3Packages; [ - websocket_client + websocket-client six ]; }}/${python3Packages.python.sitePackages}"; diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix index 4440b24a2b1..19da740938c 100644 --- a/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/pkgs/applications/networking/p2p/zeronet/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket_client + gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket-client gevent-websocket rencode bitcoinlib maxminddb pyopenssl ]; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 94bd0877a7d..d7ade6899dc 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { requests iso-639 iso3166 - websocket_client + websocket-client isodate ]) ++ [ rtmpdump diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index 233ee13ead8..cc893680674 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -3,7 +3,7 @@ , mock, pytest, nose , pyyaml, backports_ssl_match_hostname, colorama, docopt , dockerpty, docker, ipaddress, jsonschema, requests -, six, texttable, websocket_client, cached-property +, six, texttable, websocket-client, cached-property , enum34, functools32, paramiko, distro, python-dotenv }: @@ -22,7 +22,7 @@ buildPythonApplication rec { checkInputs = [ mock pytest nose ]; propagatedBuildInputs = [ pyyaml colorama dockerpty docker - ipaddress jsonschema requests six texttable websocket_client + ipaddress jsonschema requests six texttable websocket-client docopt cached-property paramiko distro python-dotenv ] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname ++ lib.optional (pythonOlder "3.4") enum34 diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 2bb950beb28..9ea4fdf64b5 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/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"; diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix index 90e34288154..44a0165d6fd 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/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 = [ diff --git a/pkgs/development/python-modules/docker-py/default.nix b/pkgs/development/python-modules/docker-py/default.nix index f7982c4a119..2d88f64d36a 100644 --- a/pkgs/development/python-modules/docker-py/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index ab7a7b664b0..5e5071e9308 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/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 = [ diff --git a/pkgs/development/python-modules/gradient/default.nix b/pkgs/development/python-modules/gradient/default.nix index 1965e0d3ade..9a2f89e8c41 100644 --- a/pkgs/development/python-modules/gradient/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index b2d6da18fe7..c8cc21278b6 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index fe8756fde03..1c59878b478 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix index 84ea65a7477..2dc34b883be 100644 --- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix +++ b/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" ]; diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index f2cb598a6c9..952527d5cab 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/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"; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index a900c61d40b..a70923de2be 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index 77dcdcaef02..edee7a62536 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/orvibo/default.nix b/pkgs/development/python-modules/orvibo/default.nix index 6209baa144b..17a3a769111 100644 --- a/pkgs/development/python-modules/orvibo/default.nix +++ b/pkgs/development/python-modules/orvibo/default.nix @@ -6,7 +6,7 @@ , pytest-runner , pytestCheckHook , requests -, websocket_client +, websocket-client }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index dc832809c28..5c41c3308be 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/praw/6.3.nix b/pkgs/development/python-modules/praw/6.3.nix index 3fc485c00ec..242300949ec 100644 --- a/pkgs/development/python-modules/praw/6.3.nix +++ b/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 = [ diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 5047c1e88b0..5ae4d0b280f 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/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 = [ diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix index 43cab7db675..92338d92531 100644 --- a/pkgs/development/python-modules/pushbullet/default.nix +++ b/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="" diff --git a/pkgs/development/python-modules/pyfireservicerota/default.nix b/pkgs/development/python-modules/pyfireservicerota/default.nix index 99d910dd8af..9d917a48016 100644 --- a/pkgs/development/python-modules/pyfireservicerota/default.nix +++ b/pkgs/development/python-modules/pyfireservicerota/default.nix @@ -4,7 +4,7 @@ , pytz , oauthlib , requests -, websocket_client +, websocket-client }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { pytz oauthlib requests - websocket_client + websocket-client ]; # no tests implemented diff --git a/pkgs/development/python-modules/pysc2/default.nix b/pkgs/development/python-modules/pysc2/default.nix index d02c85fb4ff..9d0bef8e19d 100644 --- a/pkgs/development/python-modules/pysc2/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/python-engineio/3.nix b/pkgs/development/python-modules/python-engineio/3.nix index 5deeec0bb57..f113f47802b 100644 --- a/pkgs/development/python-modules/python-engineio/3.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index ed03d966307..486484bca3a 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index 82ee7e20924..8c43d7a4ca2 100644 --- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/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" ]; diff --git a/pkgs/development/python-modules/roonapi/default.nix b/pkgs/development/python-modules/roonapi/default.nix index dc31ea4a038..677483e8823 100644 --- a/pkgs/development/python-modules/roonapi/default.nix +++ b/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 = [ diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index 9244a94d235..c47054632c6 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/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 = [ diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix index d29e89db846..174af902351 100644 --- a/pkgs/development/python-modules/samsungctl/default.nix +++ b/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 diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index 3a12568c4d6..31fa56a3472 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index d04fd24f2e9..1d884959831 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index cf7b161261e..e96161228a5 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/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 ]; diff --git a/pkgs/development/python-modules/waterfurnace/default.nix b/pkgs/development/python-modules/waterfurnace/default.nix index a07c1e6333e..526066f1fa7 100644 --- a/pkgs/development/python-modules/waterfurnace/default.nix +++ b/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 = [ diff --git a/pkgs/development/python-modules/websocket_client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix similarity index 88% rename from pkgs/development/python-modules/websocket_client/default.nix rename to pkgs/development/python-modules/websocket-client/default.nix index 6ad0634631d..b6b2c7ee036 100644 --- a/pkgs/development/python-modules/websocket_client/default.nix +++ b/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="; }; diff --git a/pkgs/development/tools/mpfshell/default.nix b/pkgs/development/tools/mpfshell/default.nix index efe2b397f95..e8a2a9b8921 100644 --- a/pkgs/development/tools/mpfshell/default.nix +++ b/pkgs/development/tools/mpfshell/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonPackage rec { }; propagatedBuildInputs = with python3Packages; [ - pyserial colorama websocket_client + pyserial colorama websocket-client ]; doCheck = false; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 4e43bbe29a2..a097cbad66d 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -208,7 +208,7 @@ self: super: { }); ensime-vim = super.ensime-vim.overrideAttrs (old: { - passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; + passthru.python3Dependencies = ps: with ps; [ sexpdata websocket-client ]; dependencies = with self; [ vimproc-vim vimshell-vim self.self forms ]; }); diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 7b100b692a3..7af675de41f 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { sockjs uvloop voluptuous - websocket_client + websocket-client yarl ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index c7aa936c323..8623fcc87f9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -323,7 +323,7 @@ "google_translate" = ps: with ps; [ gtts ]; "google_travel_time" = ps: with ps; [ googlemaps ]; "google_wifi" = ps: with ps; [ ]; - "gpmdp" = ps: with ps; [ websocket_client ]; + "gpmdp" = ps: with ps; [ websocket-client ]; "gpsd" = ps: with ps; [ gps3 ]; "gpslogger" = ps: with ps; [ aiohttp-cors ]; "graphite" = ps: with ps; [ ]; diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index ea0caf02055..7c75e34f019 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -145,7 +145,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { sshtunnel urllib3 vsts-cd-manager - websocket_client + websocket-client xmltodict javaproperties jsondiff diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 6dc575c6b60..228fb4503cf 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -499,11 +499,10 @@ let }; }); - websocket_client = super.websocket_client.overridePythonAttrs(oldAttrs: rec { + websocket-client = super.websocket-client.overridePythonAttrs(oldAttrs: rec { version = "0.56.0"; - src = super.fetchPypi { - inherit (oldAttrs) pname; + src = oldAttrs.src.override { inherit version; sha256 = "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z"; }; diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix index f40ef295d13..744fd482ab1 100644 --- a/pkgs/tools/networking/dd-agent/5.nix +++ b/pkgs/tools/networking/dd-agent/5.nix @@ -17,7 +17,7 @@ let propagatedBuildInputs = with self; [ six requests - websocket_client + websocket-client ipaddress docker_pycreds uptime diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 1c9e8149232..eaaf7046fff 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -79,7 +79,7 @@ in with localPython.pkgs; buildPythonApplication rec { # Otherwise, awsebcli will try to install it using pip when using some # commands (like "eb local run"). blessed botocore cement colorama dockerpty docopt pathspec pyyaml - requests semantic-version setuptools tabulate termcolor websocket_client + requests semantic-version setuptools tabulate termcolor websocket-client ]; postInstall = '' diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4a19d69d562..15e09c0f7bb 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -52,4 +52,5 @@ mapAliases ({ smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 + websocket_client = websocket-client; }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 90165725b3b..b853c574196 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8937,7 +8937,7 @@ in { webrtcvad = callPackage ../development/python-modules/webrtcvad { }; - websocket_client = callPackage ../development/python-modules/websocket_client { }; + websocket-client = callPackage ../development/python-modules/websocket-client { }; websockets = callPackage ../development/python-modules/websockets { };