From 64dfa559041eeac2459fef26d07db6e035c20e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 10 Dec 2022 22:53:22 +0100
Subject: [PATCH 1/2] python310Packages.aiohttp-openmetrics: init at 0.0.11

---
 .../aiohttp-openmetrics/default.nix           | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/aiohttp-openmetrics/default.nix

diff --git a/pkgs/development/python-modules/aiohttp-openmetrics/default.nix b/pkgs/development/python-modules/aiohttp-openmetrics/default.nix
new file mode 100644
index 000000000000..ed6568ac7b34
--- /dev/null
+++ b/pkgs/development/python-modules/aiohttp-openmetrics/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, aiohttp
+, prometheus-client
+}:
+
+buildPythonPackage rec {
+  pname = "aiohttp-openmetrics";
+  version = "0.0.11";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-GIVUkjyn+iQSMZZ6dNmmimvbt+t+uxOYv2QEDk/dA+g=";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    prometheus-client
+  ];
+
+  # no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "aiohttp_openmetrics" ];
+
+  meta = with lib; {
+    description = "OpenMetrics provider for aiohttp";
+    homepage = "https://github.com/jelmer/aiohttp-openmetrics/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 821073b9c781..5df9e742ac92 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -198,6 +198,8 @@ self: super: with self; {
 
   aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { };
 
+  aiohttp-openmetrics = callPackage ../development/python-modules/aiohttp-openmetrics { };
+
   aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { };
 
   aiohttp-retry = callPackage ../development/python-modules/aiohttp-retry { };

From d9f5e18533809c24846199604faa3feafb43bccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 10 Dec 2022 22:53:39 +0100
Subject: [PATCH 2/2] prometheus-xmpp-alerts: 0.5.3 -> 0.5.6

---
 pkgs/servers/monitoring/prometheus/xmpp-alerts.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
index f34d22a5faa8..af5f631a8d78 100644
--- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
+++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix
@@ -6,19 +6,27 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "prometheus-xmpp-alerts";
-  version = "0.5.3";
+  version = "0.5.6";
 
   src = fetchFromGitHub {
     owner = "jelmer";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-gb7lFRqqw4w/B+Sw0iteDkuGsPfw/ZZ+sRMTu5vxIUo=";
+    sha256 = "sha256-PwShGS1rbfZCK5OS6Cnn+mduOpWAD4fC69mcGB5GB1c=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "bs4" "beautifulsoup4"
+  '';
+
   propagatedBuildInputs = [
     prometheus-alertmanager
   ] ++ (with python3Packages; [
     aiohttp
+    aiohttp-openmetrics
+    beautifulsoup4
+    jinja2
     slixmpp
     prometheus-client
     pyyaml
@@ -29,6 +37,8 @@ python3Packages.buildPythonApplication rec {
     pytz
   ];
 
+  pythonImportsCheck = [ "prometheus_xmpp" ];
+
   meta = {
     description = "XMPP Web hook for Prometheus";
     homepage = "https://github.com/jelmer/prometheus-xmpp-alerts";