diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index d359d524eb2..7c3a516ed9d 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -16,7 +16,7 @@ , cryptography , beautifulsoup4 , sqlalchemy-utils -, prometheus_client +, prometheus-client , celery , alembic , importlib-metadata @@ -70,7 +70,7 @@ buildPythonPackage rec { cryptography beautifulsoup4 sqlalchemy-utils - prometheus_client + prometheus-client # Unofficial runtime dependencies? celery diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index a285d484ed2..86d293973d7 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -14,7 +14,7 @@ , dnspython , sshpubkeys , weasyprint -, prometheus_client +, prometheus-client , python }: let @@ -52,7 +52,7 @@ buildPythonPackage rec { pystache sshpubkeys weasyprint - prometheus_client + prometheus-client dnspython ]; diff --git a/pkgs/development/python-modules/flower/default.nix b/pkgs/development/python-modules/flower/default.nix index 67ecdde0d5f..0d4f834f1f0 100644 --- a/pkgs/development/python-modules/flower/default.nix +++ b/pkgs/development/python-modules/flower/default.nix @@ -6,7 +6,7 @@ , mock , pytz , tornado -, prometheus_client +, prometheus-client , pytestCheckHook }: @@ -30,7 +30,7 @@ buildPythonPackage rec { pytz tornado humanize - prometheus_client + prometheus-client ]; checkInputs = [ diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index a8ae35e2bdd..72e1540e078 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -17,7 +17,7 @@ , nbconvert , send2trash , terminado -, prometheus_client +, prometheus-client , anyio , websocket-client , requests @@ -46,7 +46,7 @@ buildPythonPackage rec { nbconvert send2trash terminado - prometheus_client + prometheus-client anyio websocket-client ]; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 904cd7df0c2..a90fa0eb9a1 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -13,7 +13,7 @@ , jupyter-telemetry , oauthlib , pamela -, prometheus_client +, prometheus-client , requests , sqlalchemy , tornado @@ -121,7 +121,7 @@ buildPythonPackage rec { jupyter-telemetry oauthlib pamela - prometheus_client + prometheus-client requests sqlalchemy tornado diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index c2251a0e236..d1dd4478cf5 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -4,7 +4,7 @@ , flask , karton-core , mistune -, prometheus_client +, prometheus-client }: buildPythonPackage rec { @@ -22,13 +22,13 @@ buildPythonPackage rec { flask karton-core mistune - prometheus_client + prometheus-client ]; postPatch = '' substituteInPlace requirements.txt \ --replace "Flask==1.1.1" "Flask" \ - --replace "prometheus_client==0.9.0" "prometheus-client" + --replace "prometheus-client==0.9.0" "prometheus-client" ''; # Project has no tests. pythonImportsCheck requires MinIO configuration diff --git a/pkgs/development/python-modules/notebook/2.nix b/pkgs/development/python-modules/notebook/2.nix index 0e5cfdf4397..179fd25beff 100644 --- a/pkgs/development/python-modules/notebook/2.nix +++ b/pkgs/development/python-modules/notebook/2.nix @@ -20,7 +20,7 @@ , requests , send2trash , pexpect -, prometheus_client +, prometheus-client }: buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 tornado ipython_genutils traitlets jupyter_core send2trash jupyter_client nbformat nbconvert ipykernel terminado requests pexpect - prometheus_client + prometheus-client ]; # disable warning_filters diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 3276c8ec51c..bc1296b8a50 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -21,7 +21,7 @@ , requests , send2trash , pexpect -, prometheus_client +, prometheus-client , pytestCheckHook }: @@ -43,7 +43,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 tornado ipython_genutils traitlets jupyter_core send2trash jupyter_client nbformat nbconvert ipykernel terminado requests pexpect - prometheus_client argon2_cffi + prometheus-client argon2_cffi ]; # disable warning_filters diff --git a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix index dc35aea6cd1..7abb9670ac8 100644 --- a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix +++ b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , flask -, prometheus_client +, prometheus-client , pytestCheckHook }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1dwisp681w0f6zf0000rxd3ksdb48zb9mr38qfdqk2ir24y8w370"; }; - propagatedBuildInputs = [ flask prometheus_client ]; + propagatedBuildInputs = [ flask prometheus-client ]; checkInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/" ]; diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index 1a8a52fd246..d67ddba02b9 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -5,7 +5,7 @@ , flask , isPy27 , nixosTests -, prometheus_client +, prometheus-client , py-air-control , pytestCheckHook , setuptools-scm @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click flask - prometheus_client + prometheus-client py-air-control ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 6d91d5fa72b..da88c09c5b6 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -658,7 +658,7 @@ "profiler" = ps: with ps; [ guppy3 objgraph pyprof2calltree ]; "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix - "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; + "prometheus" = ps: with ps; [ aiohttp-cors prometheus-client ]; "prosegur" = ps: with ps; [ pyprosegur ]; "prowl" = ps: with ps; [ ]; "proximity" = ps: with ps; [ ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 63b79aebe09..f996ebe1390 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -40,7 +40,7 @@ buildPythonApplication rec { netaddr phonenumbers pillow - prometheus_client + prometheus-client psutil psycopg2 pyasn1 diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 365df2fec6f..46f9bccceff 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonPackage rec { mautrix phonenumbers pillow - prometheus_client + prometheus-client pycryptodome python-olm python_magic diff --git a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix index 333be373211..f2d50fe8501 100644 --- a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { }) ]; - propagatedBuildInputs = with python3Packages; [ prometheus_client bitcoinlib riprova ]; + propagatedBuildInputs = with python3Packages; [ prometheus-client bitcoinlib riprova ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/servers/monitoring/prometheus/kea-exporter.nix b/pkgs/servers/monitoring/prometheus/kea-exporter.nix index 1f5ff7c0223..98df8861e82 100644 --- a/pkgs/servers/monitoring/prometheus/kea-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/kea-exporter.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ click - prometheus_client + prometheus-client ]; checkPhase = '' diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index bb9aaf58797..f0b6055f2ba 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -Dm0755 knot_exporter $out/bin/knot_exporter patchShebangs $out/bin - buildPythonPath ${python3.pkgs.prometheus_client} + buildPythonPath ${python3.pkgs.prometheus-client} patchPythonScript $out/bin/knot_exporter runHook postInstall diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/pkgs/servers/monitoring/prometheus/tor-exporter.nix index 663b532c8fc..fcfe87806eb 100644 --- a/pkgs/servers/monitoring/prometheus/tor-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/tor-exporter.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1gzf42z0cgdqijbi9cwpjkqzkvnabaxkkfa5ac5h27r3pxx3q4n0"; }; - propagatedBuildInputs = with python3Packages; [ prometheus_client stem retrying ]; + propagatedBuildInputs = with python3Packages; [ prometheus-client stem retrying ]; installPhase = '' mkdir -p $out/share/ diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index ddffc9c55da..97593cecca8 100644 --- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { ] ++ (with python3Packages; [ aiohttp slixmpp - prometheus_client + prometheus-client pyyaml ]); diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index b29151911a6..acf96d008f7 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { icalendar jinja2 multidict - prometheus_client + prometheus-client ]; passthru.tests.xandikos = nixosTests.xandikos; diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix index e466be816e4..16b0b1ea09d 100644 --- a/pkgs/tools/networking/dd-agent/integrations-core.nix +++ b/pkgs/tools/networking/dd-agent/integrations-core.nix @@ -65,7 +65,7 @@ let pname = "checks-base"; sourceRoot = "datadog_checks_base"; propagatedBuildInputs = with python.pkgs; [ - requests protobuf prometheus_client uuid simplejson uptime + requests protobuf prometheus-client uuid simplejson uptime ]; };