From 508bb7f42e7337b1788a4d7bcdb0bffc3519682c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 10 Jun 2021 11:53:03 +0200
Subject: [PATCH 1/3] python3Packages.prometheus-client: rename and enable
 tests

---
 .../prometheus-client/default.nix             | 29 +++++++++++++++++++
 .../prometheus_client/default.nix             | 19 ------------
 pkgs/top-level/python-aliases.nix             |  3 +-
 pkgs/top-level/python-packages.nix            |  2 +-
 4 files changed, 32 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/prometheus-client/default.nix
 delete mode 100644 pkgs/development/python-modules/prometheus_client/default.nix

diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix
new file mode 100644
index 000000000000..9a01769695ac
--- /dev/null
+++ b/pkgs/development/python-modules/prometheus-client/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "prometheus-client";
+  version = "0.11.0";
+
+  src = fetchFromGitHub {
+    owner = "prometheus";
+    repo = "client_python";
+    rev = "v${version}";
+    sha256 = "14swmy4dgpk6cyjsm2advgc2c8api7xaca1sl7swznblh5fyzgzg";
+  };
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "prometheus_client" ];
+
+  meta = with lib; {
+    description = "Prometheus instrumentation library for Python applications";
+    homepage = "https://github.com/prometheus/client_python";
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix
deleted file mode 100644
index 7ce36e588d71..000000000000
--- a/pkgs/development/python-modules/prometheus_client/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi }:
-
-buildPythonPackage rec {
-  pname = "prometheus_client";
-  version = "0.11.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "3a8baade6cb80bcfe43297e33e7623f3118d660d41387593758e2fb1ea173a86";
-  };
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Prometheus instrumentation library for Python applications";
-    homepage = "https://github.com/prometheus/client_python";
-    license = licenses.asl20;
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 3f60f90e0804..27b467cbb2a4 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -53,7 +53,9 @@ mapAliases ({
   HAP-python = hap-python; # added 2021-06-01
   lammps-cython = throw "no longer builds and is unmaintained";
   MechanicalSoup = mechanicalsoup; # added 2021-06-01
+  pam = python-pam; # added 2020-09-07.
   privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20
+  prometheus_client = prometheus-client; # added 2021-06-10
   prompt_toolkit = prompt-toolkit;
   pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
   pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
@@ -63,7 +65,6 @@ mapAliases ({
   pytestquickcheck = pytest-quickcheck; # added 2021-07-20
   pytestrunner = pytest-runner; # added 2021-01-04
   python-lz4 = lz4; # added 2018-06-01
-  pam = python-pam; # added 2020-09-07.
   pytest_xdist = pytest-xdist; # added 2021-01-04
   python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
   qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index af437fa0f3bd..bce658066d28 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5671,7 +5671,7 @@ in {
 
   progress = callPackage ../development/python-modules/progress { };
 
-  prometheus_client = callPackage ../development/python-modules/prometheus_client { };
+  prometheus-client = callPackage ../development/python-modules/prometheus-client { };
 
   prometheus-flask-exporter = callPackage ../development/python-modules/prometheus-flask-exporter { };
 

From 22a4cf7d987458b02f3beaf10e0b7735d6f1b216 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 2 Jul 2021 12:17:58 +0200
Subject: [PATCH 2/3] python3Packages.gradient-utils: relax prometheus-client
 depedency

---
 pkgs/development/python-modules/gradient-utils/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/gradient-utils/default.nix b/pkgs/development/python-modules/gradient-utils/default.nix
index ee8d1bde6222..171f87b5ddb2 100644
--- a/pkgs/development/python-modules/gradient-utils/default.nix
+++ b/pkgs/development/python-modules/gradient-utils/default.nix
@@ -5,7 +5,7 @@
 , mock
 , numpy
 , poetry-core
-, prometheus_client
+, prometheus-client
 , pytestCheckHook
 , requests
 }:
@@ -26,14 +26,15 @@ buildPythonPackage rec {
     substituteInPlace pyproject.toml \
       --replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \
       --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \
-      --replace 'wheel = "^0.35.1"' 'wheel = "*"'
+      --replace 'wheel = "^0.35.1"' 'wheel = "*"' \
+      --replace 'prometheus-client = ">=0.8,<0.10"' 'prometheus-client = "*"'
   '';
 
   nativeBuildInputs = [ poetry-core ];
 
   propagatedBuildInputs = [
     hyperopt
-    prometheus_client
+    prometheus-client
     numpy
   ];
 

From 6b77988f96e0d100fdde9825a58fbe0f74a722a9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 26 Aug 2021 02:08:48 +0200
Subject: [PATCH 3/3] treewide: prometheus_client -> prometheus-client

---
 pkgs/applications/version-management/sourcehut/core.nix     | 4 ++--
 pkgs/applications/version-management/sourcehut/meta.nix     | 4 ++--
 pkgs/development/python-modules/flower/default.nix          | 4 ++--
 pkgs/development/python-modules/jupyter_server/default.nix  | 4 ++--
 pkgs/development/python-modules/jupyterhub/default.nix      | 4 ++--
 .../development/python-modules/karton-dashboard/default.nix | 6 +++---
 pkgs/development/python-modules/notebook/2.nix              | 4 ++--
 pkgs/development/python-modules/notebook/default.nix        | 4 ++--
 .../python-modules/prometheus-flask-exporter/default.nix    | 4 ++--
 .../python-modules/py-air-control-exporter/default.nix      | 4 ++--
 pkgs/servers/home-assistant/component-packages.nix          | 2 +-
 pkgs/servers/matrix-synapse/default.nix                     | 2 +-
 pkgs/servers/mautrix-signal/default.nix                     | 2 +-
 pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix     | 2 +-
 pkgs/servers/monitoring/prometheus/kea-exporter.nix         | 2 +-
 pkgs/servers/monitoring/prometheus/knot-exporter.nix        | 2 +-
 pkgs/servers/monitoring/prometheus/tor-exporter.nix         | 2 +-
 pkgs/servers/monitoring/prometheus/xmpp-alerts.nix          | 2 +-
 pkgs/servers/xandikos/default.nix                           | 2 +-
 pkgs/tools/networking/dd-agent/integrations-core.nix        | 2 +-
 20 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix
index d359d524eb29..7c3a516ed9dc 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 a285d484ed2a..86d293973d7f 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 67ecdde0d5f1..0d4f834f1f0c 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 a8ae35e2bdd0..72e1540e0781 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 904cd7df0c2a..a90fa0eb9a13 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 c2251a0e2363..d1dd4478cf53 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 0e5cfdf43971..179fd25beff9 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 3276c8ec51c9..bc1296b8a50c 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 dc35aea6cd11..7abb9670ac8a 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 1a8a52fd246e..d67ddba02b9c 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 6d91d5fa72bc..da88c09c5b61 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 63b79aebe09c..f996ebe13909 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 365df2fec6f5..46f9bccceff6 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 333be3732112..f2d50fe85014 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 1f5ff7c02235..98df8861e825 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 bb9aaf587972..f0b6055f2ba0 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 663b532c8fc6..fcfe87806eb9 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 ddffc9c55daf..97593cecca89 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 b29151911a63..acf96d008f7a 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 e466be816e43..16b0b1ea09d6 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
     ];
   };