git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #112125 from dotlambda/alerta

alerta: move to all-packages.nix and use buildPythonApplication

commit6692b32105610b17efa5a00d8e5e87fd4be49734 authorRobert Schütz <dev@schuetz-co.de> dateMon 8 Mar 2021, 10:09 (6 years ago) parent2b74b05336c114
6 files changed+39−45
nixos/modules/services/monitoring/alerta.nix+2−2 pkgs/development/python-modules/alerta/default.nix−29 pkgs/servers/monitoring/alerta/client.nix+27 pkgs/development/python-modules/alerta-server/default.nix → pkgs/servers/monitoring/alerta/default.nix+6−10 pkgs/top-level/all-packages.nix+4 pkgs/top-level/python-packages.nix−4
nixos/modules/services/monitoring/alerta.nix+2−2
@@ -95,13 +95,13 @@ in
9595 ALERTA_SVR_CONF_FILE = alertaConf;
9696 };
9797 serviceConfig = {
98− ExecStart = "${pkgs.python36Packages.alerta-server}/bin/alertad run --port ${toString cfg.port} --host ${cfg.bind}";
98+ ExecStart = "${pkgs.alerta-server}/bin/alertad run --port ${toString cfg.port} --host ${cfg.bind}";
9999 User = "alerta";
100100 Group = "alerta";
101101 };
102102 };
103103
104− environment.systemPackages = [ pkgs.python36Packages.alerta ];
104+ environment.systemPackages = [ pkgs.alerta ];
105105
106106 users.users.alerta = {
107107 uid = config.ids.uids.alerta;
pkgs/development/python-modules/alerta/default.nixdeleted−29
@@ -1,29 +0,0 @@
1−{ lib, buildPythonPackage, fetchPypi
2−, six, click, requests, requests-hawk, pytz, tabulate, pythonOlder
3−}:
4−
5−buildPythonPackage rec {
6− pname = "alerta";
7− version = "8.4.0";
8−
9− src = fetchPypi {
10− inherit pname version;
11− sha256 = "260ff3118e73396104129928217b0f317ac5afdff8221874d8986df22ecf5f34";
12− };
13−
14− propagatedBuildInputs = [ six click requests requests-hawk pytz tabulate ];
15−
16− doCheck = false;
17−
18− postInstall = ''
19− wrapProgram $out/bin/alerta --prefix PYTHONPATH : "$PYTHONPATH"
20− '';
21−
22− disabled = pythonOlder "3.5";
23−
24− meta = with lib; {
25− homepage = "https://alerta.io";
26− description = "Alerta Monitoring System command-line interface";
27− license = licenses.asl20;
28− };
29−}
pkgs/servers/monitoring/alerta/client.nixnew file+27
@@ -0,0 +1,27 @@
1+{ lib
2+, python3
3+}:
4+
5+python3.pkgs.buildPythonApplication rec {
6+ pname = "alerta";
7+ version = "8.4.0";
8+
9+ src = python3.pkgs.fetchPypi {
10+ inherit pname version;
11+ sha256 = "260ff3118e73396104129928217b0f317ac5afdff8221874d8986df22ecf5f34";
12+ };
13+
14+ propagatedBuildInputs = with python3.pkgs; [
15+ six click requests requests-hawk pytz tabulate
16+ ];
17+
18+ doCheck = false;
19+
20+ disabled = python3.pythonOlder "3.6";
21+
22+ meta = with lib; {
23+ homepage = "https://alerta.io";
24+ description = "Alerta Monitoring System command-line interface";
25+ license = licenses.asl20;
26+ };
27+}
pkgs/development/python-modules/alerta-server/default.nix → pkgs/servers/monitoring/alerta/default.nixrenamed+6−10
@@ -1,17 +1,17 @@
1−{ lib, buildPythonPackage, fetchPypi, pythonOlder
2−, bcrypt, blinker, flask, flask-compress, flask-cors, mohawk, psycopg2, pyjwt, pymongo, python-dateutil, pytz, pyyaml, requests, requests-hawk, sentry-sdk
1+{ lib
2+, python3
33}:
44
5−buildPythonPackage rec {
5+python3.pkgs.buildPythonApplication rec {
66 pname = "alerta-server";
77 version = "8.3.3";
88
9− src = fetchPypi {
9+ src = python3.pkgs.fetchPypi {
1010 inherit pname version;
1111 sha256 = "a2713a31c6e326c774a3ee0328f424f944b951935ff1b893a4a66598d61c5a97";
1212 };
1313
14− propagatedBuildInputs = [
14+ propagatedBuildInputs = with python3.pkgs; [
1515 bcrypt
1616 blinker
1717 flask
@@ -31,11 +31,7 @@ buildPythonPackage rec {
3131
3232 doCheck = false; # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server
3333
34− postInstall = ''
35− wrapProgram $out/bin/alertad --prefix PYTHONPATH : "$PYTHONPATH"
36− '';
37−
38− disabled = pythonOlder "3.5";
34+ disabled = python3.pythonOlder "3.6";
3935
4036 meta = with lib; {
4137 homepage = "https://alerta.io";
pkgs/top-level/all-packages.nix+4
@@ -17832,6 +17832,10 @@ in
1783217832
1783317833 adguardhome = callPackage ../servers/adguardhome {};
1783417834
17835+ alerta = callPackage ../servers/monitoring/alerta/client.nix { };
17836+
17837+ alerta-server = callPackage ../servers/monitoring/alerta { };
17838+
1783517839 apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
1783617840 apacheHttpd = pkgs.apacheHttpd_2_4;
1783717841
pkgs/top-level/python-packages.nix−4
@@ -334,10 +334,6 @@ in {
334334
335335 alembic = callPackage ../development/python-modules/alembic { };
336336
337− alerta = callPackage ../development/python-modules/alerta { };
338−
339− alerta-server = callPackage ../development/python-modules/alerta-server { };
340−
341337 algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { };
342338
343339 allpairspy = callPackage ../development/python-modules/allpairspy { };