From 41f448f2fcdd79f5478caaab05b0461ab359e1d5 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Thu, 29 Apr 2021 23:29:51 +0200 Subject: [PATCH] prometheus-xmpp-alerts: 0.4.2 -> 0.5.1 --- .../monitoring/prometheus/xmpp-alerts.nix | 31 +++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index 93e6f1767ad..ddffc9c55da 100644 --- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -1,17 +1,36 @@ -{ lib, fetchFromGitHub, pythonPackages }: +{ lib +, fetchFromGitHub +, python3Packages +, prometheus-alertmanager +}: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "prometheus-xmpp-alerts"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "jelmer"; repo = pname; - rev = version; - sha256 = "17aq6v4ahnga82r350kx1y8i7zgikpzmwzaacj7a339kh8hxkh63"; + rev = "v${version}"; + sha256 = "0qmmmlcanbrhyyxi32gy3gibgvj7jdjwpa8cf5ci9czvbyxg4rld"; }; - propagatedBuildInputs = with pythonPackages; [ slixmpp prometheus_client pyyaml ]; + propagatedBuildInputs = [ + prometheus-alertmanager + ] ++ (with python3Packages; [ + aiohttp + slixmpp + prometheus_client + pyyaml + ]); + + checkInputs = with python3Packages; [ + pytz + ]; + + checkPhase = '' + ${python3Packages.python.interpreter} -m unittest discover + ''; meta = { description = "XMPP Web hook for Prometheus"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6c77bdab94..ebe4bd46516 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19193,9 +19193,7 @@ in prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; }; - prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { - pythonPackages = python3Packages; - }; + prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { }; prometheus-cpp = callPackage ../development/libraries/prometheus-cpp { };