git.iko.soy/typeable/nixpkgs
on master help sign in
alerta-server: move to all-packages.nix and use buildPythonApplication
commit3fcd9361b5bfe9ec5cf1a07036e1c2127bb81492 authorRobert Schütz <dev@schuetz-co.de> dateSat 6 Feb 2021, 11:36 (6 years ago) parentd032867
4 files changed+9−13
nixos/modules/services/monitoring/alerta.nix+1−1 pkgs/development/python-modules/alerta-server/default.nix → pkgs/servers/monitoring/alerta/default.nix+6−10 pkgs/top-level/all-packages.nix+2 pkgs/top-level/python-packages.nix−2
nixos/modules/services/monitoring/alerta.nix+1−1
@@ -95,7 +95,7 @@ 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 };
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+2
@@ -17733,6 +17733,8 @@ in
1773317733
1773417734 adguardhome = callPackage ../servers/adguardhome {};
1773517735
17736+ alerta-server = callPackage ../servers/monitoring/alerta { };
17737+
1773617738 apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
1773717739 apacheHttpd = pkgs.apacheHttpd_2_4;
1773817740
pkgs/top-level/python-packages.nix−2
@@ -324,8 +324,6 @@ in {
324324
325325 alerta = callPackage ../development/python-modules/alerta { };
326326
327− alerta-server = callPackage ../development/python-modules/alerta-server { };
328−
329327 algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { };
330328
331329 allpairspy = callPackage ../development/python-modules/allpairspy { };